From 1dfd327f6f502d0ca0d9ecc38cc499adec08dbe7 Mon Sep 17 00:00:00 2001 From: j Date: Sat, 14 Nov 2015 15:38:45 +0100 Subject: [PATCH] merge update.py cleanups from bzr branch --- update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update.py b/update.py index cd730317..a78354d6 100755 --- a/update.py +++ b/update.py @@ -112,7 +112,7 @@ if __name__ == "__main__": old = int(old) if new.isdigit(): new = int(new) - print 'Post Update from %d to %d' % (old, new) + print 'Post Update from %s to %s' % (old, new) if old < 3111: run('bzr', 'resolved', 'pandora/monkey_patch', 'pandora/monkey_patch/migrations') if os.path.exists('pandora/monkey_patch'): @@ -171,6 +171,7 @@ if __name__ == "__main__": os.unlink('REPOSITORY_MOVED_TO_GIT') if os.path.exists('.bzr'): shutil.rmtree('.bzr') + run('git', 'checkout', 'update.py') else: if len(sys.argv) == 1: release = get_release()