Revision: 35955 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35955 Author: nazgul Date: 2011-04-02 05:53:42 +0000 (Sat, 02 Apr 2011) Log Message: ----------- pep8 fixes for buildbot
Modified Paths: -------------- trunk/blender/build_files/buildbot/master_unpack.py trunk/blender/build_files/buildbot/slave_compile.py Modified: trunk/blender/build_files/buildbot/master_unpack.py =================================================================== --- trunk/blender/build_files/buildbot/master_unpack.py 2011-04-02 03:05:49 UTC (rev 35954) +++ trunk/blender/build_files/buildbot/master_unpack.py 2011-04-02 05:53:42 UTC (rev 35955) @@ -45,7 +45,9 @@ 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 @@ 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 Modified: trunk/blender/build_files/buildbot/slave_compile.py =================================================================== --- trunk/blender/build_files/buildbot/slave_compile.py 2011-04-02 03:05:49 UTC (rev 35954) +++ trunk/blender/build_files/buildbot/slave_compile.py 2011-04-02 05:53:42 UTC (rev 35955) @@ -54,6 +54,7 @@ else: # scons os.chdir(blender_dir) + scons_cmd = ['python', 'scons/scons.py'] scons_options = [] if builder.startswith('linux'): @@ -79,7 +80,7 @@ '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 @@ 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) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs