[Bf-blender-cvs] [2366043] master: Buildbot: proper fix for 'testbuild overriding master builds' issue.

[Bastien Montagne]

Commit: 23660438ad00b3b38fb60fc1428ed4075de47314
Author: Bastien Montagne
Date:   Wed Jul 23 22:33:37 2014 +0200
Branches: master
https://developer.blender.org/rB23660438ad00b3b38fb60fc1428ed4075de47314

Buildbot: proper fix for 'testbuild overriding master builds' issue.

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

M	build_files/buildbot/master.cfg

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

diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index d5bc8b9..1762ee6 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -148,6 +148,7 @@ def schedule_build(name, hour, minute=0):
 # Note that any particular build will only take place on one slave.
 
 from buildbot.process.factory import BuildFactory
+from buildbot.process.properties import Interpolate
 from buildbot.steps.source import SVN
 from buildbot.steps.source import Git
 from buildbot.steps.shell import ShellCommand
@@ -264,7 +265,7 @@ def generic_builder(id, libdir='', branch='', rsync=False):
     f.addStep(Compile(command=['python', compile_script, id], timeout=3600))
     f.addStep(Test(command=['python', test_script, id]))
     f.addStep(ShellCommand(name='package',
-                           command=['python', pack_script, id, branch],
+                           command=['python', pack_script, id, branch or Interpolate('%(src:blender:branch)s')],
                            description='packaging',
                            descriptionDone='packaged'))
     if rsync: