diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-06-04 01:36:39 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-06-04 01:36:39 +0400 |
| commit | d84c6a3cdb60c4e31db75efc4c6f9a3ea9e9f034 (patch) | |
| tree | f8c31fd55740db3b420a7e87dc5d2f96bbe29750 /build_files | |
| parent | 06ca70373768826da6c98f5eb5631f817164e11d (diff) | |
Fix for linux buildslaves. Now they should be able to compile branches.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 2 | ||||
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 9980207cb0b..e74d889c243 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -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 diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 13578cbaaef..cdc7cff3275 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -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) |