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

[Martin Pool]

[r=mbp][no-qa] Remove runtime non-test dependency of buildmaster on buildd code

stop lp non-test code importing buildd slave code - one more bit for bug 800295 - thanks wgrant

[Martin Pool (mbp)]

going to send this in based on wgrant's previously saying to make just this change

[Martin Pool (mbp)]

running in http://ec2-174-129-133-50.compute-1.amazonaws.com/

[Martin Pool (mbp)]

landing seems to be blocked by bug 890816

=== 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 03:01:25 +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):