<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/8d94e2ff0d8eeee39b788305f1d735d40ade1e06">https://github.com/macports/macports-base/commit/8d94e2ff0d8eeee39b788305f1d735d40ade1e06</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 8d94e2ff0 _upgrade: skip archivefetch/destroot if possible
</span>8d94e2ff0 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8d94e2ff0d8eeee39b788305f1d735d40ade1e06
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Oct 31 15:40:31 2023 +1100

<span style='display:block; white-space:pre;color:#404040;'>    _upgrade: skip archivefetch/destroot if possible
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Don't even run archivefetch if in source-only mode or destroot if in
</span><span style='display:block; white-space:pre;color:#404040;'>    binary-only mode.
</span>---
 src/macports1.0/macports.tcl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 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 27e3cf5fc..6df986d8c 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;'>@@ -4344,8 +4344,6 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    array unset interp_options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     set will_build no
     set already_installed [registry::entry_exists $newname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]
     # avoid building again unnecessarily
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4408,14 +4406,19 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span>             # doing this instead of just running install ensures that we have the
             # new copy ready but not yet installed, so we can safely uninstall the
             # existing one.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            set archivefetch_failed 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {mportexec $mport archivefetch} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set archivefetch_failed 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } elseif {$result != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                set archivefetch_failed 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set archivefetch_failed 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {![info exists interp_options(ports_source_only)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[catch {mportexec $mport archivefetch} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                } elseif {$result == 0 && [$workername eval [list find_portarchive_path]] ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    set archivefetch_failed 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>             }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {$archivefetch_failed || [$workername eval [list find_portarchive_path]] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$archivefetch_failed} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[info exists interp_options(ports_binary_only)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    _upgrade_cleanup
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>                 if {[catch {mportexec $mport destroot} result]} {
                     ui_debug $::errorInfo
                     _upgrade_cleanup
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4439,6 +4442,8 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    array unset interp_options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     # check if the startupitem is loaded, so we can load again it after upgrading
     # (deactivating the old version will unload the startupitem)
     set loaded_startupitems [list]
</pre><pre style='margin:0'>

</pre>