Skip to content

Commit

Permalink
bugfix in self-update
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiaskramm committed Apr 6, 2012
1 parent dab6f67 commit 99abcb8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions autoupdate.py
Expand Up @@ -67,12 +67,12 @@ def stop(self):
if current_revision != server_revision: if current_revision != server_revision:
print "upgrading from revision %s to revision %s" % (current_revision, server_revision) print "upgrading from revision %s to revision %s" % (current_revision, server_revision)


script_mtime_before = sys.stat("autoupdate.py")[stat.ST_MTIME] script_mtime_before = os.stat("autoupdate.py")[stat.ST_MTIME]
try: try:
print run("git merge FETCH_HEAD") print run("git merge FETCH_HEAD")
except: except:
print "Error merging revision %s" % server_revision print "Error merging revision %s" % server_revision
script_mtime_after = sys.stat("autoupdate.py")[stat.ST_MTIME] script_mtime_after = os.stat("autoupdate.py")[stat.ST_MTIME]


try: try:
server.stop() server.stop()
Expand Down

0 comments on commit 99abcb8

Please sign in to comment.