<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/dd5450b752da9be7d7b2e48e90c80c0e9ba786ef">https://github.com/macports/mpbb/commit/dd5450b752da9be7d7b2e48e90c80c0e9ba786ef</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 dd5450b mpbb: partially revert
</span>dd5450b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dd5450b752da9be7d7b2e48e90c80c0e9ba786ef
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 5 22:29:30 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> mpbb: partially revert
</span>---
tools/sort-with-subports.tcl | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 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 44b9baf..6d8a272 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;'>@@ -326,22 +326,24 @@ while {[llength $todo] > 0} {
</span> set canonicalnames($p) $portinfo(name)
}
<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:#e0ffe0;'>+ if {![info exists outputports($p)] || $outputports($p) == 1} {
</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:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portdepinfo($p) $deplist
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portdepinfo($p) $deplist
</span>
array unset portinfo
}
</pre><pre style='margin:0'>
</pre>