[Bf-blender-cvs] [35f07cf] master: Buildbot: Never write 'master' branch in packed file names.

[Bastien Montagne]

Commit: 35f07cfc1bf29c88936347e1ba0211d0f1ee35c3
Author: Bastien Montagne
Date:   Thu Jul 24 19:34:32 2014 +0200
Branches: master
https://developer.blender.org/rB35f07cfc1bf29c88936347e1ba0211d0f1ee35c3

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

===================================================================

M	build_files/buildbot/slave_pack.py

===================================================================

diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 2a940f9..8f4bae9 100644
--- 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: