Merge branch 'master' into buildbot-0.8.0

* master: check that build_status exists before looking at .number (fixes buildbot#855)
djmitche · May 24, 2010 · 150e4e8 · 150e4e8
2 parents e836fb4 + 0947412
commit 150e4e8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/buildbot/process/builder.py b/buildbot/process/builder.py
@@ -654,10 +654,10 @@ def reclaimAllBuilds(self):
 
     def getBuild(self, number):
         for b in self.building:
-            if b.build_status.number == number:
+            if b.build_status and b.build_status.number == number:
                 return b
         for b in self.old_building.keys():
-            if b.build_status.number == number:
+            if b.build_status and b.build_status.number == number:
                 return b
         return None