[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55187] trunk/blender/build_files/buildbot /slave_compile.py: Fix first regression introduced with r55173: need to import shutil before using methods from it

Sergey Sharybin sergey.vfx at gmail.com
Mon Mar 11 10:11:46 CET 2013


Revision: 55187
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55187
Author:   nazgul
Date:     2013-03-11 09:11:46 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Fix first regression introduced with r55173: need to import shutil before using methods from it
Otherwise linux buildbot fails dramatically.

That revision also leads to msvc runtime libs being removed, will fix this
in separate commit.

Take more respect for such creepy as linux and windows platforms, they're not so bad!

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55173

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_compile.py

Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py	2013-03-11 09:06:49 UTC (rev 55186)
+++ trunk/blender/build_files/buildbot/slave_compile.py	2013-03-11 09:11:46 UTC (rev 55187)
@@ -21,6 +21,7 @@
 import os
 import subprocess
 import sys
+import shutil
 
 # get builder name
 if len(sys.argv) < 2:
@@ -70,8 +71,6 @@
     config_dir = os.path.join(buildbot_dir, 'config')
 
     if builder.find('linux') != -1:
-        import shutil
-
         configs = []
         if builder.endswith('linux_glibc211_x86_64_scons'):
             configs = ['user-config-player-glibc211-x86_64.py',




More information about the Bf-blender-cvs mailing list