Check that we have a remote before starting the next step, or that we

have a slave reference before releasing locks. Fixes: #822
buildbot · Aug 25, 2010 · ccbd4c8 · ccbd4c8
1 parent 628d95f
commit ccbd4c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/master/buildbot/process/base.py b/master/buildbot/process/base.py
@@ -339,6 +339,8 @@ def getNextStep(self):
             return None
         if not self.steps:
             return None
+        if not self.remote:
+            return None
         if self.terminate:
             while True:
                 s = self.steps.pop(0)

diff --git a/master/buildbot/process/builder.py b/master/buildbot/process/builder.py
@@ -928,7 +928,8 @@ def buildFinished(self, build, sb, bids):
             brids = [br.id for br in build.requests]
             self.db.retire_buildrequests(brids, results)
 
-        sb.slave.releaseLocks()
+        if sb.slave:
+            sb.slave.releaseLocks()
 
         self.triggerNewBuildCheck()