[Buildbot-commits] buildbot/buildbot/slave commands.py,1.19,1.20 bot.py,1.7,1.8

[Brian Warner]

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

Modified Files:
	commands.py bot.py 
Log Message:
* buildbot/slave/commands.py (SourceBase.doCopy): use cp -p to
preserve timestamps, helps incremental builds of large trees.
Patch from Rene Rivera.

* buildbot/slave/bot.py (SlaveBuilder.commandComplete): oops, log
'failure' and not the non-existent 'why'. Thanks to Rene Rivera
for the catch.


Index: bot.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/bot.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- bot.py	1 Apr 2005 06:02:24 -0000	1.7
+++ bot.py	6 Apr 2005 00:48:28 -0000	1.8
@@ -199,7 +199,7 @@
     def commandComplete(self, failure):
         if failure:
             log.msg("SlaveBuilder.commandFailed", self.command)
-            log.err(why)
+            log.err(failure)
             # failure, if present, is a failure.Failure. To send it across
             # the wire, we must turn it into a pb.CopyableFailure.
             failure = pb.CopyableFailure(failure)

Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- commands.py	6 Dec 2004 09:00:32 -0000	1.19
+++ commands.py	6 Apr 2005 00:48:28 -0000	1.20
@@ -331,7 +331,7 @@
     def start(self):
         """Start the command. self.running will be set just before this is
         called. This method should return a Deferred that will fire when the
-        command has completed.
+        command has completed. The Deferred's argument will be ignored.
 
         This method should be overridden by subclasses."""
         raise NotImplementedError, "You must implement this in a subclass"
@@ -601,7 +601,7 @@
         if runtime.platformType != "posix":
             shutil.copytree(fromdir, todir)
             return
-        command = ['cp', '-r', fromdir, todir]
+        command = ['cp', '-r', '-p', fromdir, todir]
         c = ShellCommand(self.builder, command, self.builder.basedir,
                          sendRC=False, timeout=self.timeout)
         self.command = c