[Buildbot-commits] buildbot/buildbot/process base.py,1.84,1.85

[Brian Warner]

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

Modified Files:
	base.py 
Log Message:
[project @ #278:enhancedBuildSlavesPage-v2.diff]
short patch by Ben Hearsum to make the /buildslaves WebStatus? page
a little more useful. It does do things: 1) bolds the 'slave is NOT
connected' line to make it more visible 2) shows whether each slave
is busy (building) or not

Original author: dustin at v.igoro.us
Date: 2008-06-01 17:34:09+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- base.py	22 May 2008 22:13:22 -0000	1.84
+++ base.py	25 Jun 2008 23:52:40 -0000	1.85
@@ -309,6 +309,7 @@
         # now that we have a build_status, we can set properties
         self.setupProperties()
         self.setupSlaveBuilder(slavebuilder)
+        slavebuilder.slave.updateSlaveStatus(buildStarted=build_status)
 
         # convert all locks into their real forms
         self.locks = [self.builder.botmaster.getLockByID(l)
@@ -318,10 +319,11 @@
         self.remote = slavebuilder.remote
         self.remote.notifyOnDisconnect(self.lostRemote)
         d = self.deferred = defer.Deferred()
-        def _release_slave(res):
+        def _release_slave(res, slave, bs):
             self.slavebuilder.buildFinished()
+            slave.updateSlaveStatus(buildFinished=bs)
             return res
-        d.addCallback(_release_slave)
+        d.addCallback(_release_slave, self.slavebuilder.slave, build_status)
 
         try:
             self.setupBuild(expectations) # create .steps