From b9b93616c7e11d49a38c09f5b6379ff29dae939f Mon Sep 17 00:00:00 2001 From: spoludo ou Date: Tue, 2 Sep 2014 17:22:22 +0300 Subject: [PATCH] Fix a url persistence issue in the Trigger step The triggered build url were lost because they were added to the step after it was marked finished and thus persisted. --- master/buildbot/steps/trigger.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/master/buildbot/steps/trigger.py b/master/buildbot/steps/trigger.py index 1cd4726891a..68da1d4e53a 100644 --- 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