<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/f2fc9a530f53a081cb73e084fe4a8f712b48d482">https://github.com/macports/macports-base/commit/f2fc9a530f53a081cb73e084fe4a8f712b48d482</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.10 by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f2fc9a530 action_deps: don't merge portinfo
</span>f2fc9a530 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f2fc9a530f53a081cb73e084fe4a8f712b48d482
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 7 19:47:26 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> action_deps: don't merge portinfo
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Using dict merge will not remove a value that exists in the index when
</span><span style='display:block; white-space:pre;color:#404040;'> it doesn't exist at all in the info from the Portfile.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 41e0ebaa4f65fff74c27fc9781662a0e3873d0f3)
</span>---
src/port/port.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
<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 da5e3a370..894850f7a 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;'>@@ -2846,7 +2846,7 @@ proc action_deps { action portlist opts } {
</span> ui_debug "$::errorInfo"
break_softcontinue "Unable to open port: $result" 1 status
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [dict merge $portinfo [mportinfo $mport]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [mportinfo $mport]
</span> mportclose $mport
} elseif {$portinfo eq ""} {
ui_warn "port ${action} --index does not work with the 'current' pseudo-port"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2926,7 +2926,7 @@ proc action_deps { action portlist opts } {
</span> ui_debug "$::errorInfo"
break_softcontinue "Unable to open port: $result" 1 status
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [dict merge $portinfo [mportinfo $mport]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [mportinfo $mport]
</span> mportclose $mport
}
</pre><pre style='margin:0'>
</pre>