<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/0ff09a1be7928167de06ba384ce9c41de04bbcd8">https://github.com/macports/macports-base/commit/0ff09a1be7928167de06ba384ce9c41de04bbcd8</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 0ff09a1be restore: follow replaced_by
</span>0ff09a1be is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ff09a1be7928167de06ba384ce9c41de04bbcd8
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Feb 19 10:48:09 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> restore: follow replaced_by
</span>---
src/macports1.0/restore.tcl | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
<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 433e8c6db..937476da6 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;'>@@ -473,6 +473,25 @@ namespace eval restore {
</span> set requested_variants ""
set requested 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $portinfo replaced_by]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set replacement [dict get $portinfo replaced_by]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "$portname is replaced by $replacement"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port [mportlookup $replacement]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[llength $port] >= 2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lassign $port portname portinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If we've already seen the replacement, skip it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $mports $portname] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [macports::_mport_supports_archs [dict get $mports $portname] [dict get $required_archs $portname]]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Will probably fail to install, but that will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # handled and reported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "lookup of $replacement failed, continuing with $portname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set porturl [dict get $portinfo porturl]
# Open the port with the requested variants from the snapshot
</pre><pre style='margin:0'>
</pre>