<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/a9597dcb02df76d128e96995428ab385078ae12d">https://github.com/macports/macports-base/commit/a9597dcb02df76d128e96995428ab385078ae12d</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 a9597dcb0 _upgrade: only run destroot if there's no archive
</span>a9597dcb0 is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    _upgrade: only run destroot if there's no archive
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/67017
</span>---
 src/macports1.0/macports.tcl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 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 ce7237e4b..27e3cf5fc 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;'>@@ -4404,26 +4404,26 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span>             # but we don't know if we want to do this at that point.
             $workername eval {set force_archive_refresh yes}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # run archivefetch and destroot for version_in_tree
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            # run archivefetch and (if needed) destroot for version_in_tree
</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:#e0ffe0;'>+            set archivefetch_failed 0
</span>             if {[catch {mportexec $mport archivefetch} result]} {
                 ui_debug $::errorInfo
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                _upgrade_cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set archivefetch_failed 1
</span>             } elseif {$result != 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                _upgrade_cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set archivefetch_failed 1
</span>             }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            # the following is a noop if archivefetch found an archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {mportexec $mport destroot} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                _upgrade_cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } elseif {$result != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                _upgrade_cleanup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$archivefetch_failed || [$workername eval [list find_portarchive_path]] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[catch {mportexec $mport destroot} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ui_debug $::errorInfo
</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;'>+                } elseif {$result != 0} {
</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>             }
         } else {
             # Normal non-forced case
</pre><pre style='margin:0'>

</pre>