[150574] trunk/dports/devel/buildbot

[ryandesign at macports.org]

Revision: 150574
          https://trac.macports.org/changeset/150574
Author:   ryandesign at macports.org
Date:     2016-07-22 12:48:33 -0700 (Fri, 22 Jul 2016)
Log Message:
-----------
buildbot: fix URL list for steps with Dynamic Triggers

Modified Paths:
--------------
    trunk/dports/devel/buildbot/Portfile

Added Paths:
-----------
    trunk/dports/devel/buildbot/files/patch-buildbot-steps-trigger.py.diff

Modified: trunk/dports/devel/buildbot/Portfile
===================================================================
--- trunk/dports/devel/buildbot/Portfile	2016-07-22 19:12:53 UTC (rev 150573)
+++ trunk/dports/devel/buildbot/Portfile	2016-07-22 19:48:33 UTC (rev 150574)
@@ -6,7 +6,7 @@
 
 name                    buildbot
 version                 0.8.12
-revision                2
+revision                3
 categories              devel python
 platforms               darwin
 supported_archs         noarch
@@ -35,7 +35,8 @@
                         port:py${python.version}-sqlalchemy-migrate \
                         port:py${python.version}-twisted
 
-patchfiles-append       patch-allowRecent_SQA_Migrate.diff
+patchfiles-append       patch-allowRecent_SQA_Migrate.diff \
+                        patch-buildbot-steps-trigger.py.diff
 
 build.env               NO_INSTALL_REQS=1
 

Added: trunk/dports/devel/buildbot/files/patch-buildbot-steps-trigger.py.diff
===================================================================
--- trunk/dports/devel/buildbot/files/patch-buildbot-steps-trigger.py.diff	                        (rev 0)
+++ trunk/dports/devel/buildbot/files/patch-buildbot-steps-trigger.py.diff	2016-07-22 19:48:33 UTC (rev 150574)
@@ -0,0 +1,36 @@
+https://github.com/buildbot/buildbot/pull/2052
+https://github.com/buildbot/buildbot/commit/246df8f53945f68aa3ef8c33254ca51dd4794a8e
+--- buildbot/steps/trigger.py.orig
++++ buildbot/steps/trigger.py
+@@ -181,11 +181,11 @@ def start(self):
+             return
+ 
+         was_exception = was_failure = False
+-        brids = {}
++        brids = []
+         for was_cb, results in rclist:
+             if isinstance(results, tuple):
+                 results, some_brids = results
+-                brids.update(some_brids)
++                brids.extend(some_brids.items())
+ 
+             if not was_cb:
+                 was_exception = True
+@@ -207,7 +207,7 @@ def start(self):
+ 
+             def add_links(res):
+                 # reverse the dictionary lookup for brid to builder name
+-                brid_to_bn = dict((_brid, _bn) for _bn, _brid in brids.iteritems())
++                brid_to_bn = dict((bt[1], bt[0]) for bt in brids)
+ 
+                 for was_cb, builddicts in res:
+                     if was_cb:
+@@ -218,7 +218,7 @@ def add_links(res):
+                             url = master.status.getURLForBuild(bn, num)
+                             self.step_status.addURL("%s #%d" % (bn, num), url)
+ 
+-            builddicts = [master.db.builds.getBuildsForRequest(br) for br in brids.values()]
++            builddicts = [master.db.builds.getBuildsForRequest(br[1]) for br in brids]
+             res = yield defer.DeferredList(builddicts, consumeErrors=1)
+             add_links(res)
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160722/8e705ccf/attachment.html>