mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-06 06:15:04 +00:00
(svn r11531) -Fix [FS#1459]: version determination did stall (read: never finish) when both svn and git were not installed.
This commit is contained in:
parent
6f7d37d3d3
commit
8c5814156f
@ -127,10 +127,7 @@ Function DetermineSVNVersion()
|
|||||||
' svn detection failed, reset error and try git
|
' svn detection failed, reset error and try git
|
||||||
Err.Clear
|
Err.Clear
|
||||||
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
|
Set oExec = WshShell.Exec("git rev-parse --verify --short=8 HEAD")
|
||||||
Do While oExec.Status = 0 And Err.Number = 0
|
If Err.Number = 0 Then
|
||||||
' Wait till command has finished
|
|
||||||
Loop
|
|
||||||
If Err.Number = 0 And oExec.ExitCode = 0 Then
|
|
||||||
version = "g" & oExec.StdOut.ReadLine()
|
version = "g" & oExec.StdOut.ReadLine()
|
||||||
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
|
Set oExec = WshShell.Exec("git diff-index --exit-code --quiet HEAD ../src")
|
||||||
Do While oExec.Status = 0 And Err.Number = 0
|
Do While oExec.Status = 0 And Err.Number = 0
|
||||||
|
Loading…
Reference in New Issue
Block a user