<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ad8b6dd402c8dead9823fdebc14e10cc236e04c3">https://github.com/macports/macports-base/commit/ad8b6dd402c8dead9823fdebc14e10cc236e04c3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ad8b6dd402c8dead9823fdebc14e10cc236e04c3
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Feb 8 02:28:13 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Consistently use fully qualified names for globals
</span>---
src/port/port.tcl | 39 +++++++++++++++------------------------
1 file changed, 15 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d6fa4310..5f53f88f4 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -755,8 +755,6 @@ proc get_rdepends_ports {portname} {
</span>
proc get_dep_ports {portname recursive} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global global_variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # look up portname
if {[catch {mportlookup $portname} result]} {
ui_debug $::errorInfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -778,7 +776,7 @@ proc get_dep_ports {portname recursive} {
</span> set porturl [dict get $portinfo porturl]
# open portfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set mport [mportopen $porturl [dict create subport $portname] [array get global_variations]]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set mport [mportopen $porturl [dict create subport $portname] [array get ::global_variations]]} result]} {
</span> ui_debug $::errorInfo
if {[macports::ui_isset ports_processall]} {
ui_error "Unable to open port $portname: $result"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -827,7 +825,7 @@ proc get_dep_ports {portname recursive} {
</span> set porturl [dict get $portinfo porturl]
# open its portfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set mport [mportopen $porturl [dict create subport [dict get $portinfo name]] [array get global_variations]]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set mport [mportopen $porturl [dict create subport [dict get $portinfo name]] [array get ::global_variations]]} result]} {
</span> ui_debug $::errorInfo
ui_error "Unable to open port $depname: $result"
continue
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -866,8 +864,6 @@ proc get_dep_ports {portname recursive} {
</span> }
proc get_subports {portname} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global global_variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # look up portname
if {[catch {mportlookup $portname} result]} {
ui_debug $::errorInfo
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -889,7 +885,7 @@ proc get_subports {portname} {
</span> set porturl [dict get $portinfo porturl]
# open portfile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {set mport [mportopen $porturl [dict create subport $portname] [array get global_variations]]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set mport [mportopen $porturl [dict create subport $portname] [array get ::global_variations]]} result]} {
</span> ui_debug $::errorInfo
if {[macports::ui_isset ports_processall]} {
ui_error "Unable to open port $portname: $result"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1350,11 +1346,9 @@ proc parsePortSpec { vername varname optname {remainder ""} } {
</span> upvar $varname portvariants
upvar $optname portoptions
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global global_options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set portversion ""
array unset portoptions
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set portoptions [array get global_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set portoptions [array get ::global_options]
</span> array unset portvariants
# Parse port version/variants/options
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1555,7 +1549,6 @@ proc action_help { action portlist opts } {
</span>
proc action_log { action portlist opts } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global global_options
</span> if {[require_portlist portlist]} {
return 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1608,14 +1601,14 @@ proc action_log { action portlist opts } {
</span> set data [read $fp]
set data [split $data "\n"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists global_options(ports_log_phase)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set phase $global_options(ports_log_phase);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ::global_options(ports_log_phase)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set phase $::global_options(ports_log_phase);
</span> } else {
set phase "\[a-z\]*"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists global_options(ports_log_level)]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set index [lsearch -exact ${macports::ui_priorities} $global_options(ports_log_level)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists ::global_options(ports_log_level)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${macports::ui_priorities} $::global_options(ports_log_level)]
</span> if {$index == -1} {
set prefix ""
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1641,8 +1634,6 @@ proc action_log { action portlist opts } {
</span>
proc action_info { action portlist opts } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global global_options global_variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set status 0
if {[require_portlist portlist]} {
return 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1674,7 +1665,7 @@ proc action_info { action portlist opts } {
</span> if {!$index_only} {
# Add any global_variations to the variations
# specified for the port (so we get e.g. dependencies right)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set merged_variations [dict merge [array get global_variations] $variations]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merged_variations [dict merge [array get ::global_variations] $variations]
</span>
if {![dict exists $options subport]} {
dict set options subport $portname
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1771,9 +1762,9 @@ proc action_info { action portlist opts } {
</span> }
# replace all occurrences of --depends with the expanded options
while 1 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set order_pos [lsearch -exact $global_options(options_${action}_order) ports_info_depends]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set order_pos [lsearch -exact $::global_options(options_${action}_order) ports_info_depends]
</span> if {$order_pos != -1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set global_options(options_${action}_order) [lreplace $global_options(options_${action}_order) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set ::global_options(options_${action}_order) [lreplace $::global_options(options_${action}_order) \
</span> $order_pos $order_pos {*}$all_depends_options]
} else {
break
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1821,7 +1812,7 @@ proc action_info { action portlist opts } {
</span> set fields [list]
# This contains all parameters in order given on command line
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set opts_action $global_options(options_${action}_order)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set opts_action $::global_options(options_${action}_order)
</span> # Get the display fields in order provided on command line
# ::struct::set intersect does not keep order of items
set opts_todo [list]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1964,9 +1955,9 @@ proc action_info { action portlist opts } {
</span> if {[dict exists $variations $v]} {
# selected by command line, prefixed with +/-
set varmodifier [dict get $variations $v]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[info exists global_variations($v)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[info exists ::global_variations($v)]} {
</span> # selected by variants.conf, prefixed with (+)/(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set varmodifier "($global_variations($v))"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set varmodifier "($::global_variations($v))"
</span> # Retrieve additional information from the new key.
} elseif {[dict exists $portinfo vinfo $v is_default]} {
set varmodifier "\[[dict get $portinfo vinfo $v is_default]]"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2091,7 +2082,7 @@ proc action_notes { action portlist opts } {
</span>
# Add any global_variations to the variations
# specified for the port
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set merged_variations [dict merge [array get global_variations] $variations]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set merged_variations [dict merge [array get ::global_variations] $variations]
</span> if {![dict exists $options subport]} {
dict set options subport $portname
}
</pre><pre style='margin:0'>
</pre>