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

Make sure all files exist in minigraph.

This commit is contained in:
Eugene Yokota 2014-10-10 06:50:36 -04:00
parent b8873614e0
commit 1043d027d0
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ivy/src/main/scala/sbt/ivyint/CachedResolutionResolveEngine.scala
View File

@ -112,11 +112,19 @@ private[sbt] class CachedResolutionResolveCache() {
def loadMiniGraphFromFile: Option[Either[ResolveException, UpdateReport]] = def loadMiniGraphFromFile: Option[Either[ResolveException, UpdateReport]] =
(if (staticGraphPath.exists) Some(staticGraphPath) (if (staticGraphPath.exists) Some(staticGraphPath)
else if (dynamicGraphPath.exists) Some(dynamicGraphPath) else if (dynamicGraphPath.exists) Some(dynamicGraphPath)
else None) map { path => else None) match {
log.debug(s"parsing ${path.getAbsolutePath.toString}") case Some(path) =>
val ur = JsonUtil.parseUpdateReport(md, path, cachedDescriptor, log) log.debug(s"parsing ${path.getAbsolutePath.toString}")
updateReportCache(md.getModuleRevisionId) = Right(ur) val ur = JsonUtil.parseUpdateReport(md, path, cachedDescriptor, log)
Right(ur) if (ur.allFiles forall { _.exists }) {
updateReportCache(md.getModuleRevisionId) = Right(ur)
Some(Right(ur))
} else {
log.debug(s"some files are missing from the cache, so invalidating the minigraph")
IO.delete(path)
None
}
case _ => None
} }
(updateReportCache.get(mrid) orElse loadMiniGraphFromFile) match { (updateReportCache.get(mrid) orElse loadMiniGraphFromFile) match {
case Some(result) => case Some(result) =>