luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure sources and javadoc fetching are fine

This commit is contained in:
Alexandre Archambault 2015-12-30 01:34:36 +01:00
parent c3cc002be2
commit 22b41317d2
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/main/scala/coursier/cli/Coursier.scala
View File

@ -75,7 +75,7 @@ case class Fetch(
val helper = new Helper(common, remainingArgs)
val files0 = helper.fetch(sources = false, javadoc = false)
val files0 = helper.fetch(sources = sources, javadoc = javadoc)
val out =
if (classpath)

14
cli/src/main/scala/coursier/cli/Helper.scala
View File

@ -303,7 +303,7 @@ class Helper(
errPrintln(msg)
}
val artifacts0 =
val artifacts =
if (sources || javadoc) {
var classifiers = Seq.empty[String]
if (sources)
@ -314,18 +314,6 @@ class Helper(
res.classifiersArtifacts(classifiers)
} else
res.artifacts
val main0 = !sources && !javadoc
val artifacts = artifacts0.flatMap{ artifact =>
var l = List.empty[Artifact]
if (sources)
l = artifact.extra.get("sources").toList ::: l
if (javadoc)
l = artifact.extra.get("javadoc").toList ::: l
if (main0)
l = artifact :: l
l
}
val logger =
if (verbose0 >= 0)