<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.10
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/40f978261c2342c50cfd332ae8343cd97927a48d">https://github.com/macports/macports-base/commit/40f978261c2342c50cfd332ae8343cd97927a48d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 40f978261c2342c50cfd332ae8343cd97927a48d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 27 22:57:57 2024 +1100

<span style='display:block; white-space:pre;color:#404040;'>    Fix force activation of conflicting ports
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit 1f52c5afda3f2433632e8adee0ad1e9927381e4a)
</span>---
 src/registry2.0/portimage.tcl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/portimage.tcl b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d6652944..dee278830 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/portimage.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -782,9 +782,11 @@ proc _activate_contents {port {rename_list {}}} {
</span>                             # registry
                             if {$owner ne {}} {
                                 # Rename all conflicting files for this owner.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                set owner_paths [list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                set owner_actual_paths [list]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                                foreach {path actual_path} [dict get $conflicts_port_to_paths $owner] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                set owner_deactivate_paths [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                set owner_activate_paths [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                set owner_backup_paths [list]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                foreach pathpair [dict get $conflicts_port_to_paths $owner] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    lassign $pathpair path actual_path
</span>                                     lappend owner_deactivate_paths $path
                                     if {![catch {::file type $actual_path}]} {
                                         lappend owner_activate_paths $path
</pre><pre style='margin:0'>

</pre>