summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-11-26 23:28:29 +0000
committerrubidium <rubidium@openttd.org>2007-11-26 23:28:29 +0000
commit8c5814156f6f81da96d582d1dd757f70f6ead398 (patch)
treed2f6760a6d998c22657c3432e18133ea28b271e4
parent6f7d37d3d35c1d0a516f35b9d76f793deebaf5aa (diff)
downloadopenttd-8c5814156f6f81da96d582d1dd757f70f6ead398.tar.xz
(svn r11531) -Fix [FS#1459]: version determination did stall (read: never finish) when both svn and git were not installed.
-rw-r--r--projects/determineversion.vbs5
1 files changed, 1 insertions, 4 deletions
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
index 8f9b24d40..e478b3cbc 100644
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -127,10 +127,7 @@ Function DetermineSVNVersion()
' svn detection failed, reset error and try git
Err.Clear
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
- Do While oExec.Status = 0 And Err.Number = 0
- ' Wait till command has finished
- Loop
- If Err.Number = 0 And oExec.ExitCode = 0 Then
+ If Err.Number = 0 Then
version = "g" & oExec.StdOut.ReadLine()
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
Do While oExec.Status = 0 And Err.Number = 0