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

Make explicit where we deviate from ivy behaviour

This commit is contained in:
jvican 2017-05-26 12:26:03 +02:00
parent 7bf60557d9
commit e3a52c3e1f
No known key found for this signature in database
GPG Key ID: 42DAFA0F112E8050
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
librarymanagement/src/main/scala/sbt/internal/librarymanagement/ConvertResolver.scala
View File

@ -265,12 +265,13 @@ private[sbt] object ConvertResolver {
private final val PartEnd = ".part" private final val PartEnd = ".part"
private final val JarEnd = ".jar" private final val JarEnd = ".jar"
private final val TemporaryJar = JarEnd + PartEnd private final val TemporaryJar = JarEnd + PartEnd
override def getAndCheck(resource: Resource, target: File): Long = { override def getAndCheck(resource: Resource, target: File): Long = {
val targetPath = target.getAbsolutePath val targetPath = target.getAbsolutePath
if (!managedChecksumsEnabled || !targetPath.endsWith(TemporaryJar)) { if (!managedChecksumsEnabled || !targetPath.endsWith(TemporaryJar)) {
super.getAndCheck(resource, target) super.getAndCheck(resource, target)
} else { } else {
// This is where we differ from ivy behaviour // +ivy deviation
val size = getResource(resource, target) val size = getResource(resource, target)
val checksumAlgorithms = getChecksumAlgorithms val checksumAlgorithms = getChecksumAlgorithms
checksumAlgorithms.foldLeft(false) { (checked, algorithm) => checksumAlgorithms.foldLeft(false) { (checked, algorithm) =>
@ -279,6 +280,7 @@ private[sbt] object ConvertResolver {
if (checked) checked if (checked) checked
else downloadChecksum(resource, target, checksumFile, algorithm) else downloadChecksum(resource, target, checksumFile, algorithm)
} }
// -ivy deviation
size size
} }
} }