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

Remove "merged artifact" error message 

Fixes https://github.com/sbt/sbt/issues/4520

It seems to display "Detected merged artifact" whenever the download fails, which is confusing.
This commit is contained in:
Eugene Yokota 2020-01-06 21:25:57 -05:00
parent f8a8371057
commit cdba2dbc53
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/ParallelResolveEngine.scala
View File

@ -8,7 +8,6 @@ import org.apache.ivy.core.module.descriptor.Artifact
import org.apache.ivy.core.report._
import org.apache.ivy.core.resolve._
import org.apache.ivy.core.sort.SortEngine
import org.apache.ivy.util.Message
import org.apache.ivy.util.filter.Filter
import scala.concurrent.duration.Duration
@ -103,16 +102,6 @@ private[sbt] class ParallelResolveEngine(
artifactReport.getDownloadStatus match {
case DownloadStatus.SUCCESSFUL =>
size + artifactReport.getSize
case DownloadStatus.FAILED =>
val artifact = artifactReport.getArtifact
val mergedAttribute = artifact.getExtraAttribute("ivy:merged")
if (mergedAttribute != null) {
Message.warn(s"\tMissing merged artifact: $artifact, required by $mergedAttribute.")
} else {
Message.warn(s"\tDetected merged artifact: $artifactReport.")
resolver.reportFailure(artifactReport.getArtifact)
}
size
case _ => size
}
}