merge update.py cleanups from bzr branch

This commit is contained in:
j 2015-11-14 15:38:45 +01:00
parent 48e1435601
commit 1dfd327f6f

View file

@ -112,7 +112,7 @@ if __name__ == "__main__":
old = int(old) old = int(old)
if new.isdigit(): if new.isdigit():
new = int(new) new = int(new)
print 'Post Update from %d to %d' % (old, new) print 'Post Update from %s to %s' % (old, new)
if old < 3111: if old < 3111:
run('bzr', 'resolved', 'pandora/monkey_patch', 'pandora/monkey_patch/migrations') run('bzr', 'resolved', 'pandora/monkey_patch', 'pandora/monkey_patch/migrations')
if os.path.exists('pandora/monkey_patch'): if os.path.exists('pandora/monkey_patch'):
@ -171,6 +171,7 @@ if __name__ == "__main__":
os.unlink('REPOSITORY_MOVED_TO_GIT') os.unlink('REPOSITORY_MOVED_TO_GIT')
if os.path.exists('.bzr'): if os.path.exists('.bzr'):
shutil.rmtree('.bzr') shutil.rmtree('.bzr')
run('git', 'checkout', 'update.py')
else: else:
if len(sys.argv) == 1: if len(sys.argv) == 1:
release = get_release() release = get_release()