<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/99d88c51bcdbea01a16bd095607bc5bae95348b6">https://github.com/macports/macports-base/commit/99d88c51bcdbea01a16bd095607bc5bae95348b6</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 99d88c51b revupgrade_scanandrebuild: use dict for options
</span>99d88c51b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 99d88c51bcdbea01a16bd095607bc5bae95348b6
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Feb 20 07:29:27 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> revupgrade_scanandrebuild: use dict for options
</span>---
src/macports1.0/macports.tcl | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a6793f64..97b0b4ecd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5318,9 +5318,8 @@ proc macports::revupgrade_update_cxx_stdlib {fancy_output {revupgrade_progress "
</span> # taken.
# @return 1 if ports were rebuilt and this function should be called again,
# 0 otherwise.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc macports::revupgrade_scanandrebuild {broken_port_counts_name options} {
</span> upvar $broken_port_counts_name broken_port_counts
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set options $opts
</span>
set fancy_output [expr {![macports::ui_isset ports_debug] && [info exists macports::ui_options(progress_generic)]}]
if {$fancy_output} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5381,7 +5380,7 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span>
set architecture [$result cget -mt_archs]
while {$architecture ne "NULL"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists options(ports_rev-upgrade_id-loadcmd-check)] && $options(ports_rev-upgrade_id-loadcmd-check)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $options ports_rev-upgrade_id-loadcmd-check] && [dict get $options ports_rev-upgrade_id-loadcmd-check]} {
</span> if {[$architecture cget -mat_install_name] ne "NULL" && [$architecture cget -mat_install_name] ne ""} {
# check if this lib's install name actually refers to this file itself
# if this is not the case software linking against this library might have erroneous load commands
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5765,8 +5764,8 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> # shared depscache for all ports that are going to be rebuilt
array set depscache {}
set status 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- array set my_options [array get macports::global_options]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_options(ports_revupgrade) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set my_options [array get macports::global_options]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set my_options ports_revupgrade yes
</span>
# Depending on the options, calling macports::upgrade could
# uninstall later entries in this list. So get the info we need
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5778,21 +5777,21 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> }
foreach portname $topsort_portnames {
if {![info exists depscache(port:$portname)]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- unset -nocomplain my_options(ports_revupgrade_second_run) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- my_options(ports_nodeps)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict unset my_options ports_revupgrade_second_run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict unset my_options ports_nodeps
</span> if {$broken_port_counts($portname) > 1} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_options(ports_revupgrade_second_run) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set my_options ports_revupgrade_second_run yes
</span>
if {$broken_port_counts($portname) > 2} {
# runtime deps are upgraded the first time, build deps
# the second, so none left to do the third time
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set my_options(ports_nodeps) yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dict set my_options ports_nodeps yes
</span> }
}
# call macports::upgrade with ports_revupgrade option to rebuild the port
set status [macports::upgrade $portname port:$portname \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- {} [array get my_options] depscache]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {} $my_options depscache]
</span> ui_debug "Rebuilding port $portname finished with status $status"
if {$status != 0} {
error "Error rebuilding $portname"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5800,8 +5799,8 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[info exists options(ports_dryrun)] && $options(ports_dryrun)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "If this was no dry run, rev-upgrade would now run the checks again to find unresolved and newly created problems"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $options ports_dryrun] && [dict get $options ports_dryrun]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "If this was not a dry run, rev-upgrade would now run the checks again to find unresolved and newly created problems"
</span> return 0
}
return 1
</pre><pre style='margin:0'>
</pre>