<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/d6348b023fb891f7708f2fbbf6740670bc4a7267">https://github.com/macports/mpbb/commit/d6348b023fb891f7708f2fbbf6740670bc4a7267</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 d6348b0  mpbb: sort-with-subports tweaks
</span>d6348b0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit d6348b023fb891f7708f2fbbf6740670bc4a7267
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 5 22:16:10 2021 +1100

<span style='display:block; white-space:pre;color:#404040;'>    mpbb: sort-with-subports tweaks
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Less messing about to extract canonical_active_variants. Remove
</span><span style='display:block; white-space:pre;color:#404040;'>    pointless condition around dependency processing.
</span>---
 tools/sort-with-subports.tcl | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/sort-with-subports.tcl b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 8307843..44b9baf 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,11 +94,6 @@ proc check_failing_deps {portname} {
</span>     return $::failingports($portname)
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc canonical_variants {mport} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    array set info [mportinfo $mport]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    return $info(canonical_active_variants)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # slightly odd method as per mpbb's compute_failcache_hash
 proc port_files_checksum {porturl} {
     set portdir [macports::getportdir $porturl]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,9 +106,9 @@ proc port_files_checksum {porturl} {
</span>     return [::sha2::sha256 -hex $compound_hash]
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc check_failcache {portname porturl mport} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc check_failcache {portname porturl canonical_variants} {
</span>     set hash [port_files_checksum $porturl]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set key "$portname [canonical_variants $mport] $hash"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set key "$portname $canonical_variants $hash"
</span>     set ret 0
     foreach f [glob -directory $::failcache_dir -nocomplain -tails "${portname} *"] {
         if {$f eq $key} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,7 +240,8 @@ while {[llength $todo] > 0} {
</span>                 if {![catch {mportopen $portinfo(porturl) [list subport $portinfo(name)] ""} result]} {
                     set opened 1
                     set mport $result
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    if {[check_failcache $portinfo(name) $portinfo(porturl) $mport] != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    array set portinfo [mportinfo $mport]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {[check_failcache $portinfo(name) $portinfo(porturl) $portinfo(canonical_active_variants)] != 0} {
</span>                         set outputports($p) 0
                         set failingports($p) [list 2 $portinfo(name)]
                     }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -259,6 +255,7 @@ while {[llength $todo] > 0} {
</span>                     if {$opened != 1} {
                         set opened 1
                         set mport $result
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        array set portinfo [mportinfo $mport]
</span>                     }
                     set workername [ditem_key $mport workername]
                     set archive_name [$workername eval {portfetch::percent_encode [get_portimage_name]}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -291,6 +288,7 @@ while {[llength $todo] > 0} {
</span>                     if {$opened != 1} {
                         set opened 1
                         set mport $result
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        array set portinfo [mportinfo $mport]
</span>                     }
                     set supported_archs [_mportkey $mport supported_archs]
                     switch $::macports::os_arch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,24 +326,22 @@ while {[llength $todo] > 0} {
</span>             set canonicalnames($p) $portinfo(name)
         }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {![info exists outputports($p)] || $outputports($p) == 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            set deplist [list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            foreach depstype $depstypes {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {[info exists portinfo($depstype)] && $portinfo($depstype) ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    foreach onedep $portinfo($depstype) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        set depname [string tolower [lindex [split [lindex $onedep 0] :] end]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        lappend deplist $depname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if {![info exists portdepinfo($depname)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            lappend todo $depname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        if {$include_deps && ![info exists outputports($depname)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            set outputports($depname) 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set deplist [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach depstype $depstypes {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {[info exists portinfo($depstype)] && $portinfo($depstype) ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach onedep $portinfo($depstype) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set depname [string tolower [lindex [split [lindex $onedep 0] :] end]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    lappend deplist $depname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {![info exists portdepinfo($depname)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        lappend todo $depname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    if {$include_deps && ![info exists outputports($depname)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set outputports($depname) 1
</span>                     }
                 }
             }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            set portdepinfo($p) $deplist
</span>         }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        set portdepinfo($p) $deplist
</span> 
         array unset portinfo
     }
</pre><pre style='margin:0'>

</pre>