<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/a97bf2df52c03cbb2072983002903fb48ffdb5e6">https://github.com/macports/mpbb/commit/a97bf2df52c03cbb2072983002903fb48ffdb5e6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a97bf2df52c03cbb2072983002903fb48ffdb5e6
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Oct 17 23:46:15 2019 +1100
<span style='display:block; white-space:pre;color:#404040;'> sort-with-subports: don't process deps of excluded ports
</span>---
tools/sort-with-subports.tcl | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 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 30409cc..364cfe2 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;'>@@ -113,17 +113,7 @@ while {$todo ne {}} {
</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;'>- lappend todo $depname
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set portdepinfo($p) $deplist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[info exists outputports($p)] && $outputports($p) == 1} {
if {[info exists portinfo(replaced_by)]} {
puts stderr "Excluding $portinfo(name) because it is replaced by $portinfo(replaced_by)"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,6 +140,21 @@ while {$todo ne {}} {
</span> set canonicalnames($p) $portinfo(name)
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ lappend todo $depname
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> array unset portinfo
}
}
</pre><pre style='margin:0'>
</pre>