<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/cf2eae00c39b7c009ca755b727c1c035e4433c7e">https://github.com/macports/mpbb/commit/cf2eae00c39b7c009ca755b727c1c035e4433c7e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cf2eae00c39b7c009ca755b727c1c035e4433c7e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Sep 29 15:23:04 2019 +1000
<span style='display:block; white-space:pre;color:#404040;'> sort-with-subports: only do mportlookup if needed
</span>---
tools/sort-with-subports.tcl | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 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 91972f8..75f0554 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;'>@@ -87,17 +87,19 @@ set depstypes {depends_fetch depends_extract depends_patch depends_build depends
</span> while {$todo ne {}} {
set p [lindex $todo 0]
set todo [lrange $todo 1 end]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {mportlookup $p} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "$errorInfo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Failed to find port '$p': $result"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength $result] < 2} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "port $p not found in the index"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set portinfo [lindex $result 1]
</span> if {![info exists portdepinfo($p)]} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {mportlookup $p} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "$errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Failed to find port '$p': $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $result] < 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "port $p not found in the index"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</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;'>+ array set portinfo [lindex $result 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[info exists inputports($p)] && [info exists portinfo(subports)]} {
foreach subport $portinfo(subports) {
set splower [string tolower $subport]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,8 +123,8 @@ while {$todo ne {}} {
</span> if {[info exists outputports($p)]} {
set canonicalnames($p) $portinfo(name)
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ array unset portinfo
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset portinfo
</span> }
set portlist [list]
</pre><pre style='margin:0'>
</pre>