← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~mbp/launchpad/800295-protocol into lp:launchpad

 

Martin Pool has proposed merging lp:~mbp/launchpad/800295-protocol into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~mbp/launchpad/800295-protocol/+merge/82629

stop lp non-test code importing buildd slave code - one more bit for bug 800295 - thanks wgrant
-- 
https://code.launchpad.net/~mbp/launchpad/800295-protocol/+merge/82629
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mbp/launchpad/800295-protocol into lp:launchpad.
=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2011-11-17 19:41:24 +0000
+++ lib/lp/buildmaster/model/builder.py	2011-11-18 02:58:24 +0000
@@ -43,7 +43,6 @@
 from zope.component import getUtility
 from zope.interface import implements
 
-from canonical.buildd.slave import BuilderStatus
 from canonical.config import config
 from canonical.database.sqlbase import (
     SQLBase,
@@ -692,7 +691,7 @@
             return False
 
         def check_available(status):
-            return status[0] == BuilderStatus.IDLE
+            return status[0] == 'BuilderStatus.IDLE'
         return d.addCallbacks(check_available, catch_fault)
 
     def _getSlaveScannerLogger(self):


Follow ups