[Buildbot-commits] buildbot/buildbot/slave commands.py,1.24,1.25

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/slave
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18118/buildbot/slave

Modified Files:
	commands.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-67
Creator:  Brian Warner <warner at monolith.lothar.com>

fix win32 error in slave-side VC fallback copy/clobber

* buildbot/slave/commands.py (SourceBase.doClobber): when removing
the previous tree on win32, where we have to do it synchronously,
make sure we return a Deferred anyway.
(SourceBase.doCopy): same


Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- commands.py	20 Apr 2005 20:13:25 -0000	1.24
+++ commands.py	22 Apr 2005 18:41:02 -0000	1.25
@@ -591,7 +591,7 @@
             # if we're running on w32, use rmtree instead. It will block,
             # but hopefully it won't take too long.
             shutil.rmtree(d, ignore_errors=1)
-            return
+            return defer.succeed(0)
         command = ["rm", "-rf", d]
         c = ShellCommand(self.builder, command, self.builder.basedir,
                          sendRC=0, timeout=self.timeout)
@@ -609,7 +609,7 @@
         todir = os.path.join(self.builder.basedir, self.workdir)
         if runtime.platformType != "posix":
             shutil.copytree(fromdir, todir)
-            return
+            return defer.succeed(0)
         command = ['cp', '-r', '-p', fromdir, todir]
         c = ShellCommand(self.builder, command, self.builder.basedir,
                          sendRC=False, timeout=self.timeout)