From 83581db93fec92717e6d34df360bd9e5167abf34 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 22 Apr 2017 05:09:22 -0400 Subject: [PATCH 1/2] Bump to 0.13.16-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 51174f5aa..6c5bc4a55 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import Sxr.sxr // but can be shared across the multi projects. def buildLevelSettings: Seq[Setting[_]] = inThisBuild(Seq( organization := "org.scala-sbt", - version := "0.13.15-SNAPSHOT", + version := "0.13.16-SNAPSHOT", bintrayOrganization := Some(if (publishStatus.value == "releases") "typesafe" else "sbt"), bintrayRepository := s"ivy-${publishStatus.value}", bintrayPackage := "sbt", From 16c8da21edc23d3da2c1f30c8772e84b9ac738f2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 22 Apr 2017 05:10:23 -0400 Subject: [PATCH 2/2] Ignore ZipException in cache Fixes #3050 --- main/actions/src/main/scala/sbt/Sync.scala | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/main/actions/src/main/scala/sbt/Sync.scala b/main/actions/src/main/scala/sbt/Sync.scala index 7e0f9f062..8d3f8b8d9 100644 --- a/main/actions/src/main/scala/sbt/Sync.scala +++ b/main/actions/src/main/scala/sbt/Sync.scala @@ -68,6 +68,7 @@ object Sync { } import java.io.{ File, IOException } + import java.util.zip.ZipException import sbinary._ import Operations.{ read, write } import DefaultProtocol.{ FileFormat => _, _ } @@ -82,7 +83,15 @@ object Sync { def readInfo[F <: FileInfo](file: File)(implicit infoFormat: Format[F]): RelationInfo[F] = try { readUncaught(file)(infoFormat) } - catch { case e: IOException => (Relation.empty, Map.empty) } + catch { + case e: IOException => (Relation.empty, Map.empty) + case e: ZipException => (Relation.empty, Map.empty) + case e: TranslatedException => + e.getCause match { + case e: ZipException => (Relation.empty, Map.empty) + case _ => throw e + } + } def readUncaught[F <: FileInfo](file: File)(implicit infoFormat: Format[F]): RelationInfo[F] = IO.gzipFileIn(file) { in =>