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

harden clean and IO.move

This commit is contained in:
Mark Harrah 2011-04-12 23:10:36 -04:00
parent fe75bade98
commit 1c400db4d9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/Defaults.scala
View File

@ -287,7 +287,7 @@ object Defaults
def doClean(clean: Seq[File], preserve: Seq[File]): Unit = def doClean(clean: Seq[File], preserve: Seq[File]): Unit =
IO.withTemporaryDirectory { temp => IO.withTemporaryDirectory { temp =>
val mappings = preserve.zipWithIndex map { case (f, i) => (f, new File(temp, i.toHexString)) } val mappings = preserve.filter(_.exists).zipWithIndex map { case (f, i) => (f, new File(temp, i.toHexString)) }
IO.move(mappings) IO.move(mappings)
IO.delete(clean) IO.delete(clean)
IO.move(mappings.map(_.swap)) IO.move(mappings.map(_.swap))

1
util/io/IO.scala
View File

@ -574,6 +574,7 @@ object IO
{ {
if(b.exists) if(b.exists)
delete(b) delete(b)
createDirectory(b.getParentFile)
if(!a.renameTo(b)) if(!a.renameTo(b))
{ {
copyFile(a, b, true) copyFile(a, b, true)