Revision: 37147
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37147
Author: nazgul
Date: 2011-06-03 21:36:39 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Fix for linux buildslaves. Now they should be able to compile branches.
Modified Paths:
--------------
trunk/blender/build_files/buildbot/slave_compile.py
trunk/blender/build_files/buildbot/slave_pack.py
Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py 2011-06-03 20:51:25 UTC
(rev 37146)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2011-06-03 21:36:39 UTC
(rev 37147)
@@ -57,7 +57,7 @@
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
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-06-03 20:51:25 UTC
(rev 37146)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-06-03 21:36:39 UTC
(rev 37147)
@@ -43,7 +43,7 @@
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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
