Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-07-24 21:34:32 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-07-24 21:34:32 +0400
commit35f07cfc1bf29c88936347e1ba0211d0f1ee35c3 (patch)
tree8a738a1b48b3880bfae2a58c73e0d33ddc70754a /build_files
parent157fc433698558fc03ac4b58ede9e27521aae8a8 (diff)
Buildbot: Never write 'master' branch in packed file names.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_pack.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 2a940f97628..8f4bae9a380 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: