<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/41ee934bab04d0e24210ef12fccfbdf49551ecb1">https://github.com/macports/macports-base/commit/41ee934bab04d0e24210ef12fccfbdf49551ecb1</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 41ee934bab04d0e24210ef12fccfbdf49551ecb1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 16 01:34:04 2024 +1100

<span style='display:block; white-space:pre;color:#404040;'>    selfupdate: use dict for options
</span>---
 src/macports1.0/selfupdate.tcl | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/selfupdate.tcl b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fbf54324..1f9d3bfd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/selfupdate.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,11 @@ namespace eval selfupdate {
</span>     namespace export main
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc selfupdate::main {{options {}} {updatestatusvar {}}} {
</span>     global macports::prefix macports::portdbpath macports::rsync_server macports::rsync_dir \
            macports::rsync_options macports::autoconf::macports_version \
            macports::autoconf::rsync_path tcl_platform macports::autoconf::openssl_path \
            macports::autoconf::tar_path
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    array set options $optionslist
</span> 
     # variable that indicates whether we actually updated base
     if {$updatestatusvar ne ""} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,7 +128,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span>     # echo current MacPorts version
     ui_msg "MacPorts base version $macports::autoconf::macports_version installed,"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {[info exists options(ports_force)] && $options(ports_force)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[dict exists $options ports_force] && [dict get $options ports_force]} {
</span>         set use_the_force_luke yes
         ui_debug "Forcing a rebuild and reinstallation of MacPorts"
     } else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -154,21 +153,23 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span>     set comp [vercmp $macports_version_new $macports::autoconf::macports_version]
 
     # syncing ports tree.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![info exists options(ports_selfupdate_no-sync)] || !$options(ports_selfupdate_no-sync)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![dict exists $options ports_selfupdate_no-sync] || ![dict get $options ports_selfupdate_no-sync]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set syncoptions $options
</span>         if {$comp > 0} {
             # updated portfiles potentially need new base to parse - tell sync to try to
             # use prefabricated PortIndex files and signal if it couldn't
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend optionslist no_reindex 1 needed_portindex_var needed_portindex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            dict set syncoptions no_reindex 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            dict set syncoptions needed_portindex_var needed_portindex
</span>         }
         try {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            mportsync $optionslist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            mportsync $syncoptions
</span>         } on error {eMessage} {
             error "Couldn't sync the ports tree: $eMessage"
         }
     }
 
     if {$use_the_force_luke || $comp > 0} {
<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:#e0ffe0;'>+        if {[dict exists $options ports_dryrun] && [dict get $options ports_dryrun]} {
</span>             ui_msg "$macports::ui_prefix MacPorts base is outdated, selfupdate would install $macports_version_new (dry run)"
         } else {
             ui_msg "$macports::ui_prefix MacPorts base is outdated, installing new version $macports_version_new"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -260,7 +261,7 @@ proc selfupdate::main {{optionslist {}} {updatestatusvar {}}} {
</span>         error "Couldn't change permissions of the MacPorts sources at $mp_source_path to ${sources_owner}: $eMessage"
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    if {![info exists options(ports_selfupdate_no-sync)] || !$options(ports_selfupdate_no-sync)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![dict exists $options ports_selfupdate_no-sync] || ![dict get $options ports_selfupdate_no-sync]} {
</span>         if {[info exists needed_portindex]} {
             ui_msg "Not all sources could be fully synced using the old version of MacPorts."
             ui_msg "Please run selfupdate again now that MacPorts base has been updated."
</pre><pre style='margin:0'>

</pre>