<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/9beee4080f577016089a68ad6d2a3864763170e4">https://github.com/macports/macports-base/commit/9beee4080f577016089a68ad6d2a3864763170e4</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 9beee4080 selfupdate: avoid calling download_source_rsync twice
</span>9beee4080 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 9beee4080f577016089a68ad6d2a3864763170e4
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jul 16 09:50:45 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    selfupdate: avoid calling download_source_rsync twice
</span>---
 src/macports1.0/selfupdate.tcl | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 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 7c50a903d..3167de62c 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;'>@@ -591,18 +591,20 @@ proc selfupdate::main {{options {}} {updatestatusvar {}}} {
</span>         } else {
             ui_msg "$ui_prefix MacPorts base is outdated, installing new version $macports_version_new"
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {!$rsync_fetched && !$prefer_rsync} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                macports_try -pass_signal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    set source_code [download_source $mp_source_path $macports_version_new]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                } on error {eMessage} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ui_debug "download_source failed: $eMessage"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    set prefer_rsync 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {!$rsync_fetched} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {!$prefer_rsync} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    macports_try -pass_signal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set source_code [download_source $mp_source_path $macports_version_new]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    } on error {eMessage} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        ui_debug "download_source failed: $eMessage"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        set prefer_rsync 1
</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;'>+                if {$prefer_rsync} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set source_code [download_source_rsync]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set macports_version_downloaded [get_current_version_from_sources $source_code]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set comp [vercmp $macports_version_downloaded $macports_version]
</span>                 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {$prefer_rsync} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set source_code [download_source_rsync]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set macports_version_downloaded [get_current_version_from_sources $source_code]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set comp [vercmp $macports_version_downloaded $macports_version]
</span>             }
             if {$use_the_force_luke || $comp > 0 || ($comp == 0 && $migrating)} {
                 install $source_code
</pre><pre style='margin:0'>

</pre>