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

Recover when gitRetrieve(.) fails. 

When gitRetrieve(.) fails (e.g. because no git is installed) an
exception is thrown but the created directory isn't removed. This commit
removes the directory when an exception occurs, so that the user can
retry.
This commit is contained in:
Simon Olofsson 2011-06-27 16:45:22 +02:00
parent a0faaca824
commit f05cbf00b2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/Build.scala
View File

@ -56,9 +56,14 @@ object RetrieveUnit
def gitRetrieve(base: URI, tempDir: File): Unit =
if(!tempDir.exists)
{
IO.createDirectory(tempDir)
gitClone(dropFragment(base), tempDir)
Option(base.getFragment) foreach { branch => gitCheckout(tempDir, branch) }
try {
IO.createDirectory(tempDir)
gitClone(dropFragment(base), tempDir)
Option(base.getFragment) foreach { branch => gitCheckout(tempDir, branch) }
} catch {
case e => IO.delete(tempDir)
throw e
}
}
def dropFragment(base: URI): URI = if(base.getFragment eq null) base else new URI(base.getScheme, base.getSchemeSpecificPart, null)
def gitClone(base: URI, tempDir: File): Unit =
@ -246,4 +251,4 @@ object BuildPaths
final val ConfigDirectoryName = ".sbt"
def crossPath(base: File, instance: ScalaInstance): File = base / ("scala_" + instance.version)
}
}