<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[150574] trunk/dports/devel/buildbot</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/150574">150574</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-07-22 12:48:33 -0700 (Fri, 22 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot: fix URL list for steps with Dynamic Triggers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelbuildbotPortfile">trunk/dports/devel/buildbot/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelbuildbotfilespatchbuildbotstepstriggerpydiff">trunk/dports/devel/buildbot/files/patch-buildbot-steps-trigger.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelbuildbotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/buildbot/Portfile (150573 => 150574)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name buildbot
</span><span class="cx"> version 0.8.12
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> categories devel python
</span><span class="cx"> platforms darwin
</span><span class="cx"> supported_archs noarch
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx"> port:py${python.version}-sqlalchemy-migrate \
</span><span class="cx"> port:py${python.version}-twisted
</span><span class="cx">
</span><del>-patchfiles-append patch-allowRecent_SQA_Migrate.diff
</del><ins>+patchfiles-append patch-allowRecent_SQA_Migrate.diff \
+ patch-buildbot-steps-trigger.py.diff
</ins><span class="cx">
</span><span class="cx"> build.env NO_INSTALL_REQS=1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelbuildbotfilespatchbuildbotstepstriggerpydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/buildbot/files/patch-buildbot-steps-trigger.py.diff (0 => 150574)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+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)
+
</ins></span></pre>
</div>
</div>
</body>
</html>