[Buildbot-commits] buildbot/buildbot/process builder.py,1.24,1.25

[Brian Warner]

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

Modified Files:
	builder.py 
Log Message:
* buildbot/process/builder.py (Builder.attached): always return a
Deferred, even if the builder was already attached
* buildbot/test/test_run.py (Basedir.testChangeBuilddir): test it


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- builder.py	22 Apr 2005 21:29:19 -0000	1.24
+++ builder.py	26 Apr 2005 07:16:36 -0000	1.25
@@ -150,11 +150,16 @@
         
     def attached(self, remote, commands):
         """This is invoked by the BotPerspective when the self.slavename bot
-        registers their builder."""
+        registers their builder.
+
+        @rtype : L{twisted.internet.defer.Deferred}
+        @return: a Deferred that fires (with 'self') when the slave-side
+                 builder is fully attached and ready to accept commands.
+        """
         if self.remote == remote:
             # already attached to them
             log.msg("Builder %s already attached" % self.name)
-            return
+            return defer.succeed(self)
         if self.remote:
             log.msg("WEIRD", self.remote, remote)
         self.remote = remote