cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix looping updates.

Browse Source
This commit is contained in:
Rob Nelson
2013-08-14 16:26:49 -07:00
parent bc5afdf25d
commit 2d501e8f49
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DLLSocket/server_controller.py
View File

@@ -44,10 +44,10 @@ def git_branch():
return '[UNKNOWN]'
def checkForUpdate(serverState):
global GIT_REMOTE,GIT_BRANCH,COMPILE_COMMAND,GAMEPATH,CONFIGPATH
global GIT_REMOTE,GIT_BRANCH,COMPILE_COMMAND,GAMEPATH,CONFIGPATH,lastCommit
cwd=os.getcwd()
os.chdir(GAMEPATH)
subprocess.call('git pull -s recursive -Xtheirs {0} {1}'.format(GIT_REMOTE,GIT_BRANCH),shell=True)
subprocess.call('git pull -q -s recursive -Xtheirs {0} {1}'.format(GIT_REMOTE,GIT_BRANCH),shell=True)
subprocess.call('git checkout -q {0}'.format(GIT_BRANCH),shell=True)
currentCommit = git_commit()
currentBranch = git_branch()
@@ -66,6 +66,7 @@ def checkForUpdate(serverState):
else:
if os.path.isfile(updateTrigger):
os.remove(updateTrigger)
lastCommit=currentCommit
os.chdir(cwd)
# Return True for success, False otherwise.