Mercurial > hg > openttd
changeset 7975:7248d747d33b draft
(svn r11531) -Fix [FS#1459]: version determination did stall (read: never finish) when both svn and git were not installed.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 26 Nov 2007 23:28:29 +0000 |
| parents | 710556410296 |
| children | a6e7be9a25c7 |
| files | projects/determineversion.vbs |
| diffstat | 1 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -127,10 +127,7 @@ ' 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