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

Fix

This commit is contained in:
Alexandre Archambault 2015-07-07 12:29:25 +02:00
parent 0418c790b6
commit a1be48eeac
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,13 +121,11 @@ case class Coursier(
repository0 repository0
} }
val existingRepo = cache val repoMap = cache.map()
.list()
.map(_._1) if (repositoryIds.exists(!repoMap.contains(_))) {
.toSet
if (repositoryIds.exists(!existingRepo(_))) {
val notFound = repositoryIds val notFound = repositoryIds
.filter(!existingRepo(_)) .filter(!repoMap.contains(_))
Console.err.println( Console.err.println(
(if (notFound.lengthCompare(1) == 1) "Repository" else "Repositories") + (if (notFound.lengthCompare(1) == 1) "Repository" else "Repositories") +
@ -138,10 +136,8 @@ case class Coursier(
sys.exit(1) sys.exit(1)
} }
val (repositories0, fileCaches) = repositoryIds
val (repositories0, fileCaches) = cache .map(repoMap)
.list()
.map{case (_, repo, cacheEntry) => (repo, cacheEntry)}
.unzip .unzip
val repositories = repositories0 val repositories = repositories0

8
files/src/main/scala/coursier/Cache.scala
View File

@ -129,11 +129,7 @@ case class Cache(cache: File) {
} else } else
Nil Nil
def files(): Files = { def files(): Files =
val map0 = map() new Files(list().map{case (_, _, matching) => matching }, () => ???)
val default0 = default()
new Files(default0.map(map0(_)._2), () => ???)
}
} }