luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-10-06 10:03:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

ivy cache: ignore the original resolver in more places. Fixes #704

Browse Source
This commit is contained in:
Mark Harrah
2013-05-31 10:35:48 -04:00
parent 3ed46646bc
commit 7cd9feb5c6
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ivy/Ivy.scala
+4 -1
View File
@@ -14,7 +14,7 @@ import CS.singleton
import org.apache.ivy.{core, plugins, util, Ivy}
import core.{IvyPatternHelper, LogOptions}
import core.cache.{CacheMetadataOptions, DefaultRepositoryCacheManager}
import core.cache.{CacheMetadataOptions, DefaultRepositoryCacheManager, ModuleDescriptorWriter}
import core.module.descriptor.{Artifact => IArtifact, DefaultArtifact, DefaultDependencyArtifactDescriptor, MDArtifact}
import core.module.descriptor.{DefaultDependencyDescriptor, DefaultModuleDescriptor, DependencyDescriptor, ModuleDescriptor, License}
import core.module.descriptor.{OverrideDependencyDescriptorMediator}
@@ -352,6 +352,9 @@ private object IvySbt
}
rmr
}
// ignore the original resolver wherever possible to avoid issues like #704
override def saveResolvers(descriptor: ModuleDescriptor, metadataResolverName: String, artifactResolverName: String) {}
def isChanging(dd: DependencyDescriptor, requestedRevisionId: ModuleRevisionId): Boolean =
!localOnly && (dd.isChanging || requestedRevisionId.getRevision.contains("-SNAPSHOT"))
}
launch/Update.scala
+2 -1
View File
@@ -291,8 +291,9 @@ final class Update(config: UpdateConfiguration)
{
val cacheDir = settings.getDefaultRepositoryCacheBasedir()
val manager = new DefaultRepositoryCacheManager("default-cache", settings, cacheDir) {
// ignore resolvers wherever possible- not ideal, but avoids issues like #704
override def saveResolvers(descriptor: ModuleDescriptor, metadataResolverName: String, artifactResolverName: String) {}
override def findModuleInCache(dd: DependencyDescriptor, revId: ModuleRevisionId, options: CacheMetadataOptions, r: String) = {
// ignore the resolver- not ideal, but avoids thrashing.
super.findModuleInCache(dd,revId,options,null)
}
}