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

fix exception swallowing in IO.archive

This commit is contained in:
Mark Harrah 2011-03-16 22:17:09 -04:00
parent b1d39404a1
commit a2bbf741ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/io/IO.scala
View File

@ -309,7 +309,8 @@ object IO
private def writeZip(sources: Seq[(File,String)], output: ZipOutputStream)(createEntry: String => ZipEntry)
{
import Path.{lazyPathFinder => pf}
val files = sources.collect { case (file,name) if file.isFile => (file, normalizeName(name)) }
val files = sources.flatMap { case (file,name) => if (file.isFile) (file, normalizeName(name)) :: Nil else Nil }
val now = System.currentTimeMillis
// The CRC32 for an empty value, needed to store directories in zip files
val emptyCRC = new CRC32().getValue()
@ -396,7 +397,6 @@ object IO
case None => (new ZipOutputStream(fileOut), "zip")
}
try { f(zipOut) }
catch { case e: Exception => "Error writing " + ext + ": " + e.toString }
finally { zipOut.close }
}
}