<!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>[151029] contrib/mp-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/151029">151029</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-08-05 12:48:56 -0700 (Fri, 05 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mp-buildbot: Accept multi-inputs for list-subports
For the use case in our buildbot setup, we would prefer calling ./mpbb
list-subports only once with a list of all ports for which we want their
subports, so add this possibility using positional arguments.
Additionally, filter port names that are not found in the portindex to avoid
scheduling useless builds on the port builders.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbotmpbb">contrib/mp-buildbot/mpbb</a></li>
<li><a href="#contribmpbuildbotmpbblistsubports">contrib/mp-buildbot/mpbb-list-subports</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpbuildbotmpbb"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb (151028 => 151029)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb 2016-08-05 19:06:18 UTC (rev 151028)
+++ contrib/mp-buildbot/mpbb 2016-08-05 19:48:56 UTC (rev 151029)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> fi
</span><span class="cx"> ## Otherwise, run the command and deal with errors
</span><span class="cx"> export PORTSRC="${option_workdir}/macports.conf"
</span><del>-if ! $command; then
</del><ins>+if ! $command "$@"; then
</ins><span class="cx"> errmsg "Failed to run $command"
</span><span class="cx"> exit 1
</span><span class="cx"> fi
</span></span></pre></div>
<a id="contribmpbuildbotmpbblistsubports"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-list-subports (151028 => 151029)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-list-subports 2016-08-05 19:06:18 UTC (rev 151028)
+++ contrib/mp-buildbot/mpbb-list-subports 2016-08-05 19:48:56 UTC (rev 151029)
</span><span class="lines">@@ -6,16 +6,32 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> list-subports-help() {
</span><del>- echo "Print the name of port --port and any subports."
</del><ins>+ echo "Print the name of port --port and its subports."
+ echo "Alternatively, print the name and subports of multiple ports given as positional arguments."
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+print-subports() {
+ local portname=$1
+ # test whether a port with this name exists
+ port file "${portname}" >/dev/null 2>/dev/null || return 0
+
+ echo "${portname}"
+ for subport in $("${option_prefix}/bin/port" echo "subportof:${portname}" 2>/dev/null); do
+ echo "${subport}"
+ done
+}
+
</ins><span class="cx"> list-subports() {
</span><del>- if [ -z "${option_port}" ]; then
- errmsg "--port is required"
</del><ins>+ if [ $# -le 0 -a -z "${option_port}" ]; then
+ errmsg "Either --port or a list of positional arguments with port names is required."
</ins><span class="cx"> return 1
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- for subport in "${option_port}" $(port echo subportof:"${option_port}" 2>/dev/null); do
- echo $subport
</del><ins>+ if [ -n "${option_port}" ]; then
+ print-subports "${option_port}"
+ fi
+
+ for p in "$@"; do
+ print-subports "$p"
</ins><span class="cx"> done
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>