[Buildbot-devel] Some minor "fixes"

Rene Rivera grafik.list at redshift-software.com
Tue Apr 5 05:04:38 UTC 2005


Brian,

Since your in the mood for fixes. While working on getting a Buildbot 
setup going for Boost I made these local "fixes":

Index: bot.py
===================================================================
RCS file: 
/export/cvsroot/com/redshift-software/sdk/Boost/buildbot/buildbot/slave/bot.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bot.py	8 Mar 2005 06:11:09 -0000	1.1
+++ bot.py	21 Mar 2005 04:59:30 -0000	1.2
@@ -199,7 +199,6 @@
      def commandComplete(self, failure):
          if failure:
              log.msg("SlaveBuilder.commandFailed", self.command)
-            log.err(why)
              # 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: 
/export/cvsroot/com/redshift-software/sdk/Boost/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- commands.py	8 Mar 2005 06:11:09 -0000	1.1
+++ commands.py	29 Mar 2005 14:46:00 -0000	1.2
@@ -9,7 +9,7 @@
  from buildbot.slave.interfaces import ISlaveCommand
  from buildbot.slave.registry import registerSlaveCommand

-cvs_ver = '$Revision: 1.1 $'[1+len("Revision: "):-2]
+cvs_ver = '$Revision: 1.2 $'[1+len("Revision: "):-2]

  # version history:
  #  >=1.17: commands are interruptable
@@ -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
===================================================================

The slave/bot.py is just a reference to a non-existent variable. This 
only shows up if you happen to be adding custom steps and there are 
exceptions getting returned/thrown by those steps.

The second is just a tweak to allow using "copy" for source updates. And 
still support incremental builds (where the timestamps need to be kept). 
This is important for projects like Boost where doing a full checkout 
takes a long time because of sheer size of the code base.


-- 
-- Grafik - Don't Assume Anything
-- Redshift Software, Inc. - http://redshift-software.com
-- rrivera/acm.org - grafik/redshift-software.com
-- 102708583/icq - grafikrobot/aim - Grafik/jabber.org




More information about the devel mailing list