<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-contrib.
</pre>
<p><a href="https://github.com/macports/macports-contrib/commit/3b8b26949faccbc00cc1665451119b7f57a23405">https://github.com/macports/macports-contrib/commit/3b8b26949faccbc00cc1665451119b7f57a23405</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3b8b26949faccbc00cc1665451119b7f57a23405
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Dec 6 17:35:12 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> port_cutleaves: use dict
</span>---
port_cutleaves/port_cutleaves.in | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/port_cutleaves/port_cutleaves.in b/port_cutleaves/port_cutleaves.in
</span><span style='display:block; white-space:pre;color:#808080;'>index 14209a1..ddbf524 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/port_cutleaves/port_cutleaves.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/port_cutleaves/port_cutleaves.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,8 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# \
if test -x @prefix@/bin/port-tclsh; then exec @prefix@/bin/port-tclsh "$0" "$@"; else exec /usr/bin/tclsh "$0" "$@"; fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set VERSION 0.1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set VERSION 0.1.5
</span> set prefix "@prefix@"
# - Procedures ---------------------------------------------------------------
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,7 +154,6 @@ proc is_active {port} {
</span> proc collect_build_deps {installedvar} {
upvar $installedvar installed
global build_deps
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset build_deps
</span> foreach i $installed {
set iname [name $i]
if {[catch {set res [mportlookup $iname]} result]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,13 +163,12 @@ proc collect_build_deps {installedvar} {
</span> if {[llength $res] < 2} {
continue
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array unset portinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- array set portinfo [lindex $res 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [lindex $res 1]
</span> }
foreach type {depends_fetch depends_extract depends_patch depends_build} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists portinfo($type)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach d $portinfo($type) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set build_deps([lindex [split $d :] end]) 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $portinfo $type]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach d [dict get $portinfo $type] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set build_deps [lindex [split $d :] end] 1
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +201,7 @@ proc leaves {} {
</span> if {![registry::property_retrieve $regref requested]
&& [registry::list_dependents [name $port]] eq ""
&& ![should_be_excluded $port $exclusions]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && (!$option(b) || ![info exists build_deps([name $port])])} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && (!$option(b) || ![dict exists $build_deps [name $port]])} {
</span> lappend leaves $port
}
}
</pre><pre style='margin:0'>
</pre>