diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-05 14:37:59 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-05 14:37:59 -0500 |
| commit | 9f1c8965afda7db5dccac0918ead47d446577617 (patch) | |
| tree | 5d5cdcd2a69430d0c2688f3033ccd6ac6d92dea7 /project/Release.scala | |
| parent | 7780a3667f5f9977215eba80e483d90cbdcfbb94 (diff) | |
| download | scala-9f1c8965afda7db5dccac0918ead47d446577617.tar.gz scala-9f1c8965afda7db5dccac0918ead47d446577617.tar.bz2 scala-9f1c8965afda7db5dccac0918ead47d446577617.zip | |
Fixed mechanisms which pulls scala revision for properties file.
Diffstat (limited to 'project/Release.scala')
| -rw-r--r-- | project/Release.scala | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/project/Release.scala b/project/Release.scala index a8dc14988e..38111c18a3 100644 --- a/project/Release.scala +++ b/project/Release.scala @@ -94,8 +94,12 @@ object Release { def trace (t: ⇒ Throwable): Unit = () def stdoutString = stdout.toString } - git("describe", "HEAD", "--abbrev=7", "--match", "dev")(baseDirectory, outputStealer) - outputStealer.stdoutString + val result = try { + git("describe", "HEAD", "--abbrev=7", "--match", "dev")(baseDirectory, outputStealer) + } catch { + case t => git("describe", "HEAD", "--abbrev=7", "--always")(baseDirectory, outputStealer) + } + result.trim } } |