<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/f17785dea5b90a470836f3cd67949e003993f042">https://github.com/macports/macports-base/commit/f17785dea5b90a470836f3cd67949e003993f042</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 f17785dea Don't check conflicts for the install target
</span>f17785dea is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f17785dea5b90a470836f3cd67949e003993f042
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue May 20 13:53:36 2025 +1000

<span style='display:block; white-space:pre;color:#404040;'>    Don't check conflicts for the install target
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Installing without activating has not been able to result in a file
</span><span style='display:block; white-space:pre;color:#404040;'>    conflict since direct mode was removed over a decade ago.
</span>---
 src/macports1.0/macports.tcl | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 28ec8cf56..d32d60f76 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;'>@@ -2925,13 +2925,11 @@ proc mportexec {mport target} {
</span>         }
     } else {
         # No dependencies, but we still need to check for conflicts.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {$target eq "" || $target eq "install" || $target eq "activate"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            if {[catch {_mporterrorifconflictsinstalled $mport}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                if {$log_needs_pop} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    macports::pop_log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {$target in {{} activate} && [catch {_mporterrorifconflictsinstalled $mport}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if {$log_needs_pop} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                macports::pop_log
</span>             }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            return 1
</span>         }
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4183,7 +4181,7 @@ proc mportdepends {mport {target {}} {recurseDeps 1} {skipSatisfied 1} {accDeps
</span>         if {$target eq {} && [_mportcheck_known_fail $options $portinfo]} {
             return 1
         }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {[catch {_mporterrorifconflictsinstalled $mport}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {$target ne "install" && [catch {_mporterrorifconflictsinstalled $mport}]} {
</span>             return 1
         }
     }
</pre><pre style='margin:0'>

</pre>