<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/02d712af851cd90fd34f976f3e77dbbd50b72e20">https://github.com/macports/macports-base/commit/02d712af851cd90fd34f976f3e77dbbd50b72e20</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 02d712af8 restore_state: clean ports before installing
</span>02d712af8 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 02d712af851cd90fd34f976f3e77dbbd50b72e20
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Jun 6 08:14:59 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    restore_state: clean ports before installing
</span>---
 src/macports1.0/restore.tcl | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/restore.tcl b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e0ea3b08b..356f6be32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/restore.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -580,13 +580,13 @@ namespace eval restore {
</span>             }
 
             if {!$active} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                set target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set install_target install
</span>             } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                set target activate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set install_target activate
</span>             }
 
             if {[catch {set res [mportlookup $name]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_debug "$::errorInfo"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_debug $::errorInfo
</span>                 _handle_failure failed $dependencies $name "lookup of port $name failed: $result"
                 continue
             }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -611,11 +611,13 @@ namespace eval restore {
</span>                 set mport [dict get $mports $portname $variants]
             }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {set result [mportexec $mport $target]} result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_msg "$::errorInfo"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                _handle_failure failed $dependencies $name "Unable to execute target $target for port $name: $result"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            } elseif {$result != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                _handle_failure failed $dependencies $name "Failed to $target $name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            foreach target [list clean $install_target] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                if {[catch {set result [mportexec $mport $target]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ui_msg $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    _handle_failure failed $dependencies $name "Unable to execute target $target for port $name: $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                } elseif {$result != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    _handle_failure failed $dependencies $name "Failed to $target $name"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>             }
             mportclose $mport
             dict unset mports $portname $variants
</pre><pre style='margin:0'>

</pre>