<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/72064797f1a60b1ef43b1f617e8f20d272aa3027">https://github.com/macports/macports-base/commit/72064797f1a60b1ef43b1f617e8f20d272aa3027</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 72064797f1a60b1ef43b1f617e8f20d272aa3027
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Aug 12 12:47:28 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    _activate_contents: fix reporting of conflicting paths
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    (cherry picked from commit b2e06d54dc6b02b0e6bbd3db23666e80d26acaed)
</span>---
 src/registry2.0/portimage.tcl | 4 ++--
 1 file changed, 2 insertions(+), 2 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 66da39c49..0d6652944 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;'>@@ -757,12 +757,12 @@ proc _activate_contents {port {rename_list {}}} {
</span>                                 set conflicting_paths [dict get $conflicts_port_to_paths $conflicting_port]
                                 set pathcounter 0
                                 set pathtotal [llength $conflicting_paths]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                foreach {_ actual_path} $conflicting_paths {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                foreach p $conflicting_paths {
</span>                                     if {$pathcounter >= 3 && $pathtotal > 4} {
                                         append msg "  (... [expr {$pathtotal - $pathcounter}] more not shown)\n"
                                         break
                                     }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                    append msg "  ${actual_path}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    append msg "  [lindex $p 1]\n"
</span>                                     incr pathcounter
                                 }
                             }
</pre><pre style='margin:0'>

</pre>