<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/4da66a20d150117ccbbe7c70ac9efa0a2c6c1dda">https://github.com/macports/macports-base/commit/4da66a20d150117ccbbe7c70ac9efa0a2c6c1dda</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4da66a20d150117ccbbe7c70ac9efa0a2c6c1dda
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 20 14:30:44 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Follow replaced_by in port install
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> New --no-replace option disables this behaviour.
</span>---
src/port/port.tcl | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bdff4c4b4..9b0c5014c 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4185,6 +4185,19 @@ proc action_target { action portlist opts } {
</span>
# if installing, mark the port as explicitly requested
if {$action eq "install"} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[info exists portinfo(replaced_by)] && ![info exists options(ports_install_no-replace)]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_notice "$portname is replaced by $portinfo(replaced_by)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portname $portinfo(replaced_by)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array unset portinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {mportlookup $portname} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break_softcontinue "lookup of portname $portname failed: $result" 1 status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[llength $result] < 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break_softcontinue "Port $portname not found" 1 status
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ array set portinfo [lindex $result 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set porturl $portinfo(porturl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {![info exists options(ports_install_unrequested)]} {
set options(ports_requested) 1
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4470,7 +4483,7 @@ array set cmd_opts_array {
</span> space {{units 1} total}
activate {no-exec}
deactivate {no-exec}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- install {no-rev-upgrade unrequested}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install {no-replace no-rev-upgrade unrequested}
</span> uninstall {follow-dependents follow-dependencies no-exec}
variants {index}
clean {all archive dist work logs}
</pre><pre style='margin:0'>
</pre>