Fix for linux buildslaves. Now they should be able to compile branches.
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Jun 2011 21:36:39 +0000 (21:36 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 3 Jun 2011 21:36:39 +0000 (21:36 +0000)
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py

index 9980207cb0b1e5d7b967295eb56d6505f801c78b..e74d889c243f6aeef4183001a1765fdcafec1f21 100644 (file)
@@ -57,7 +57,7 @@ else:
     scons_cmd = ['python', 'scons/scons.py']
     scons_options = []
 
-    if builder.startswith('linux'):
+    if builder.find('linux') != -1:
         import shutil
 
         # We're using the same rules as release builder, so tweak
index 13578cbaaef30f6e7b7ae9a923a90e4a5183273f..cdc7cff32754a13082daa205aafc98bdbf586e51 100644 (file)
@@ -43,7 +43,7 @@ if builder.find('scons') != -1:
     os.chdir('../blender')
     scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
 
-    if builder.startswith('linux'):
+    if builder.find('linux') != -1:
         buildbot_dir = os.path.dirname(os.path.realpath(__file__))
         config_dir = os.path.join(buildbot_dir, 'config')
         build_dir = os.path.join('..', 'build', builder)