Merge pull request #1218 from Spoludo/eight

Fix a url persistence issue in the Trigger step
buildbot · Sep 6, 2014 · 2f5da04 · 2f5da04
2 parents 4a565ac + b9b9361
commit 2f5da04
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/master/buildbot/steps/trigger.py b/master/buildbot/steps/trigger.py
@@ -208,11 +208,9 @@ def add_links(res):
                             url = master.status.getURLForBuild(bn, num)
                             self.step_status.addURL("%s #%d" % (bn, num), url)
 
-                return self.end(result)
-
             builddicts = [master.db.builds.getBuildsForRequest(br) for br in brids.values()]
-            dl = defer.DeferredList(builddicts, consumeErrors=1)
-            dl.addCallback(add_links)
+            res = yield defer.DeferredList(builddicts, consumeErrors=1)
+            add_links(res)
 
         self.end(result)
         return