<!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>[151656] 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/151656">151656</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-19 05:55:32 -0700 (Fri, 19 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mp-buildbot: changes in logs for ports-progress.txt (don't list subports, fix error reports)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbotmpbbinstalldependencies">contrib/mp-buildbot/mpbb-install-dependencies</a></li>
<li><a href="#contribmpbuildbotmpbbinstallport">contrib/mp-buildbot/mpbb-install-port</a></li>
<li><a href="#contribmpbuildbotmpbblistsubports">contrib/mp-buildbot/mpbb-list-subports</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpbuildbotmpbbinstalldependencies"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-install-dependencies (151655 => 151656)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-install-dependencies 2016-08-19 12:42:27 UTC (rev 151655)
+++ contrib/mp-buildbot/mpbb-install-dependencies 2016-08-19 12:55:32 UTC (rev 151656)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
</span><span class="cx"> if [ $? -ne 0 ]; then
</span><span class="cx"> echo "Calculating dependencies for '${option_port}' failed, aborting." >&2
</span><del>- echo "[FAIL dependencies]" >> "$log_subports_progress"
</del><ins>+ echo "Building '${option_port}' ... [ERROR] (failed to calculate dependencies)" >> "$log_subports_progress"
</ins><span class="cx"> return 1
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
</span><span class="cx"> echo "Build of dependency '${depname}' failed, aborting." >&2
</span><span class="cx"> echo "[FAIL]" >> "$log_status_dependencies"
</span><del>- echo "[FAIL dependency '${depname}']" >> "$log_subports_progress"
</del><ins>+ echo "Building '${option_port}' ... [ERROR] (failed to install dependency '${depname}')" >> "$log_subports_progress"
</ins><span class="cx"> return 1
</span><span class="cx"> else
</span><span class="cx"> echo "[OK]" >> "$log_status_dependencies"
</span></span></pre></div>
<a id="contribmpbuildbotmpbbinstallport"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-install-port (151655 => 151656)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-install-port 2016-08-19 12:42:27 UTC (rev 151655)
+++ contrib/mp-buildbot/mpbb-install-port 2016-08-19 12:55:32 UTC (rev 151656)
</span><span class="lines">@@ -27,9 +27,6 @@
</span><span class="cx"> #> "$log_port_contents"
</span><span class="cx"> > "$log_port_stats"
</span><span class="cx">
</span><del>- # log: summary for the portwatcher
- echo -n "- Installing ${option_port} ... " >> "$log_subports_progress"
-
</del><span class="cx"> local time_start
</span><span class="cx"> local time_stop
</span><span class="cx"> time_start=$(date +%s)
</span><span class="lines">@@ -37,12 +34,14 @@
</span><span class="cx"> # shellcheck disable=SC2154
</span><span class="cx"> if ! "${option_prefix}/bin/port" -dk install "${option_port}"; then
</span><span class="cx"> echo "Build of '${option_port}' failed."
</span><del>- echo "[FAIL]" >> "$log_subports_progress"
</del><ins>+ # log: summary for the portwatcher
+ echo "Building '${option_port}' ... [ERROR]" >> "$log_subports_progress"
</ins><span class="cx"> return 1
</span><span class="cx"> fi
</span><span class="cx"> time_stop=$(date +%s)
</span><span class="cx">
</span><del>- echo "[OK]" >> "$log_subports_progress"
</del><ins>+ # log: summary for the portwatcher
+ echo "Building '${option_port}' ... [OK]" >> "$log_subports_progress"
</ins><span class="cx">
</span><span class="cx"> # log: contents
</span><span class="cx"> "${option_prefix}/bin/port" -q contents "${option_port}" > "$log_port_contents"
</span></span></pre></div>
<a id="contribmpbuildbotmpbblistsubports"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-list-subports (151655 => 151656)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-list-subports 2016-08-19 12:42:27 UTC (rev 151655)
+++ contrib/mp-buildbot/mpbb-list-subports 2016-08-19 12:55:32 UTC (rev 151656)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> local reason
</span><span class="cx"> # $option_logdir is set in mpbb
</span><span class="cx"> # shellcheck disable=SC2154
</span><del>- local log_subports_progress="${option_logdir}/ports-progress.txt"
</del><span class="cx">
</span><span class="cx"> os_version="$(sw_vers -productVersion | cut -d . -f 1-2)"
</span><span class="cx"> is_64bit_capable="$(sysctl -n hw.cpu64bit_capable)"
</span><span class="lines">@@ -55,17 +54,13 @@
</span><span class="cx">
</span><span class="cx"> if [ $exclude -eq 0 ]; then
</span><span class="cx"> echo "$port"
</span><del>- echo "- $port: added" >> "$log_subports_progress"
</del><span class="cx"> else
</span><span class="cx"> if [ ${#exclude_reasons[@]} -eq 1 ]; then
</span><span class="cx"> echo >&2 "Excluding '${port}' because ${exclude_reasons[0]}."
</span><del>- echo "- $port: SKIPPED because ${exclude_reasons[0]}" >> "$log_subports_progress"
</del><span class="cx"> else
</span><span class="cx"> echo >&2 "Excluding '${port}' for the following reasons:"
</span><del>- echo "- $port: SKIPPED for the following reasons" >> "$log_subports_progress"
</del><span class="cx"> for reason in "${exclude_reasons[@]}"; do
</span><span class="cx"> echo >&2 " - ${reason}"
</span><del>- echo " - ${reason}" >> "$log_subports_progress"
</del><span class="cx"> done
</span><span class="cx"> fi
</span><span class="cx"> fi
</span><span class="lines">@@ -84,7 +79,7 @@
</span><span class="cx">
</span><span class="cx"> # prepare the log file and make sure to start with an empty one
</span><span class="cx"> mkdir -p "$option_logdir"
</span><del>- echo "== Adding subports ==" > "$log_subports_progress"
</del><ins>+ > "$log_subports_progress"
</ins><span class="cx">
</span><span class="cx"> if [ -n "${option_port}" ]; then
</span><span class="cx"> print-subports "${option_port}" && success=1
</span><span class="lines">@@ -98,6 +93,4 @@
</span><span class="cx"> errmsg "None of the specified ports were found in the port index."
</span><span class="cx"> return 1
</span><span class="cx"> fi
</span><del>-
- echo "== Building subports ==" >> "$log_subports_progress"
</del><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>