Buildbot: Never write 'master' branch in packed file names.

2014-07-24 19:34:32 +02:00
parent 157fc43369
commit 35f07cfc1b
1 changed files with 2 additions and 4 deletions
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -33,10 +33,8 @@ if len(sys.argv) < 2:
    sys.exit(1)

 builder = sys.argv[1]
-branch = ''
-
-if len(sys.argv) >= 3:
-    branch = sys.argv[2]
+# Never write branch if it is master.
+branch = sys.argv[2] if (len(sys.argv) >= 3 and sys.argv[2] != 'master') else ''

 # scons does own packaging
 if builder.find('scons') != -1: