Merge andrewjcg/buildbot:brdict (PR #1124)

buildbot · Apr 6, 2014 · 2f9c8b8 · 2f9c8b8
2 parents db15a05 + 6812fd5
commit 2f9c8b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/master/buildbot/status/builder.py b/master/buildbot/status/builder.py
@@ -308,7 +308,7 @@ def getPendingBuildRequestStatuses(self):
 
         def make_statuses(brdicts):
             return [BuildRequestStatus(self.name, brdict['brid'],
-                                       self.status)
+                                       self.status, brdict=brdict)
                     for brdict in brdicts]
         d.addCallback(make_statuses)
         return d

diff --git a/master/buildbot/status/buildrequest.py b/master/buildbot/status/buildrequest.py
@@ -23,12 +23,13 @@
 class BuildRequestStatus:
     implements(interfaces.IBuildRequestStatus)
 
-    def __init__(self, buildername, brid, status):
+    def __init__(self, buildername, brid, status, brdict=None):
         self.buildername = buildername
         self.brid = brid
         self.status = status
         self.master = status.master
 
+        self._brdict = brdict
         self._buildrequest = None
         self._buildrequest_lock = defer.DeferredLock()
 
@@ -52,11 +53,13 @@ def _getBuildRequest(self):
 
         try:
             if not self._buildrequest:
-                brd = yield self.master.db.buildrequests.getBuildRequest(
-                    self.brid)
+                if self._brdict is None:
+                    self._brdict = (
+                        yield self.master.db.buildrequests.getBuildRequest(
+                            self.brid))
 
                 br = yield buildrequest.BuildRequest.fromBrdict(self.master,
-                                                                brd)
+                                                                self._brdict)
                 self._buildrequest = br
         except:  # try/finally isn't allowed in generators in older Pythons
             self._buildrequest_lock.release()