[Bf-blender-cvs] [ae396912fb4] master: Buildbot: Fix scl command prefix

Sergey Sharybin noreply at git.blender.org
Wed Jun 26 18:07:06 CEST 2019


Commit: ae396912fb4dfb6fd85e38d349e5c8394bc69d8b
Author: Sergey Sharybin
Date:   Wed Jun 26 18:06:31 2019 +0200
Branches: master
https://developer.blender.org/rBae396912fb4dfb6fd85e38d349e5c8394bc69d8b

Buildbot: Fix scl command prefix

Now it should work correct with command passed as an individual
elements of a list.

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index c71217e56dc..70958ef9d85 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -89,7 +89,7 @@ if 'cmake' in builder:
                 chroot_name = 'buildbot_' + deb_name + '_i686'
             command_prefix = ['schroot', '-c', chroot_name, '--']
         elif glibc == 'glibc217':
-            command_prefix = ['scl', 'enable', 'devtoolset-6', 'bash']
+            command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
 
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))



More information about the Bf-blender-cvs mailing list