<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.

</pre>
<p><a href="https://github.com/macports/mpbb/commit/b187a11df1d3b7d524e2bdb6f40fbbf4a2b69b6d">https://github.com/macports/mpbb/commit/b187a11df1d3b7d524e2bdb6f40fbbf4a2b69b6d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new b187a11  Refine exclusion logic
</span>b187a11 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit b187a11df1d3b7d524e2bdb6f40fbbf4a2b69b6d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 12 22:07:25 2017 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Refine exclusion logic
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Don't exclude ports that have already been built if they have not
</span><span style='display:block; white-space:pre;color:#404040;'>    already been uploaded and are distributable.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes: https://trac.macports.org/ticket/53548
</span>---
 mpbb-list-subports | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mpbb-list-subports b/mpbb-list-subports
</span><span style='display:block; white-space:pre;color:#808080;'>index eb5f7a7..9d9fb33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mpbb-list-subports
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mpbb-list-subports
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +29,9 @@ print-subports() {
</span>     # shellcheck disable=SC2154
 
     os_version="$(sw_vers -productVersion | cut -d . -f 1-2)"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # $option_prefix is set in mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # shellcheck disable=SC2154
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    tclsh=${option_prefix}/bin/port-tclsh
</span>     # $optoin_prefix is set in mpbb
     # shellcheck disable=SC2154
     ports=$("${option_prefix}/bin/port" -q info --index --line --name "${portname}" "subportof:${portname}" 2>/dev/null) || return
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +40,19 @@ print-subports() {
</span>         exclude_reasons=()
 
         # FIXME: this doesn't take selected variants into account
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # $option_prefix and $thisdir are set in mpbb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # $thisdir is set in mpbb
</span>         # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        #if [[ -f $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/archive-path.tcl" "${port}") ]]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        #    exclude=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        #    exclude_reasons+=("it has already been built")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        #fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        archive_path=$("${tclsh}" "${thisdir}/tools/archive-path.tcl" "${port}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if [[ -f "${archive_path}" ]]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            archive_basename=$(basename "${archive_path}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if curl -fIsL "${option_archive_site}/${port}/${archive_basename}" > /dev/null; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                exclude=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                exclude_reasons+=("it has already been built and uploaded")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            elif ! "${tclsh}" "${option_jobs_dir}/port_binary_distributable.tcl" "${port}"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                exclude=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                exclude_reasons+=("it has already been built and is not distributable")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fi
</span> 
         if [[ $exclude -eq 0 ]]; then
             if [[ "$port" =~ graveyard ]]; then
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +61,7 @@ print-subports() {
</span>             else
                 # $thisdir is set in mpbb
                 # shellcheck disable=SC2154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                for portgroup in $("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/portgroups.tcl" "$port"); do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                for portgroup in $("${tclsh}" "${thisdir}/tools/portgroups.tcl" "$port"); do
</span>                     if [ "$portgroup" = "obsolete-1.0" ]; then
                         exclude=1
                         exclude_reasons+=("it includes the obsolete 1.0 PortGroup")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +71,7 @@ print-subports() {
</span>         fi
 
         if [[ $exclude -eq 0 && ("${os_version}" = "10.6" || "${os_version}" = "10.5") ]]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            supported_archs=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/supported-archs.tcl" "${port}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            supported_archs=$("${tclsh}" "${thisdir}/tools/supported-archs.tcl" "${port}")
</span>             if [[ -n "${supported_archs}" ]]; then
                 is_64bit_capable="$(sysctl -n hw.cpu64bit_capable)"
                 if [[ "${os_version}" = "10.6" && "${is_64bit_capable}" = "0" && ! ("${supported_archs}" == *"x86_64"* && "${supported_archs}" == *"i386"*) ]]; then
</pre><pre style='margin:0'>

</pre>