Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-04-02 09:53:42 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-04-02 09:53:42 +0400
commit7690086d20c58872659da30e1ee7ebf404681f46 (patch)
tree2317777eaadb0dcf1f23ceec2f250beff51209ef /build_files
parentf1b42a129f0f9299a9e67eb0495131a37464c9cc (diff)
pep8 fixes for buildbot
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/master_unpack.py7
-rw-r--r--build_files/buildbot/slave_compile.py5
2 files changed, 8 insertions, 4 deletions
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index 612b686b49a..06c11b368b0 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -45,7 +45,9 @@ def get_platform(filename):
filename = strip_extension(filename)
tokens = filename.split("-")
- platforms = 'osx', 'mac', 'bsd', 'win', 'linux', 'source', 'irix', 'solaris'
+ platforms = ('osx', 'mac', 'bsd',
+ 'win', 'linux', 'source',
+ 'irix', 'solaris')
platform_tokens = []
found = False
@@ -90,7 +92,8 @@ packagename = os.path.basename(package)
platform = get_platform(packagename)
if platform == '':
- sys.stderr.write('Failed to detect platform from package: %r\n' % packagename)
+ sys.stderr.write('Failed to detect platform ' +
+ 'from package: %r\n' % packagename)
sys.exit(1)
# extract
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index ab9b9a61fbc..e6dd4840bd6 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -54,6 +54,7 @@ if builder.find('cmake') != -1:
else:
# scons
os.chdir(blender_dir)
+ scons_cmd = ['python', 'scons/scons.py']
scons_options = []
if builder.startswith('linux'):
@@ -79,7 +80,7 @@ else:
'BF_INSTALLDIR=' + install_dir]
# Clean all directories first
- retcode = subprocess.call(['python', 'scons/scons.py'] + common_options + ['clean'])
+ retcode = subprocess.call(scons_cmd + common_options + ['clean'])
if retcode != 0:
print('Error cleaning build directory')
sys.exit(retcode)
@@ -111,7 +112,7 @@ else:
scons_options.append('BF_CONFIG=' + config_fpath)
- retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
+ retcode = subprocess.call(scons_cmd + scons_options)
if retcode != 0:
print('Error building rules wuth config ' + config)
sys.exit(retcode)