<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/8c95e29fff2aef55aa38cacdbeac811150fe77d1">https://github.com/macports/macports-base/commit/8c95e29fff2aef55aa38cacdbeac811150fe77d1</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 8c95e29ff Avoid unneeded dict merges
</span>8c95e29ff is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8c95e29fff2aef55aa38cacdbeac811150fe77d1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Apr 28 13:51:39 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> Avoid unneeded dict merges
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Where needed for portinfo, only merge in portdir and porturl, which are
</span><span style='display:block; white-space:pre;color:#404040;'> the keys that mportinfo doesn't set.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 367dfd4993d1aa2f47f1a1fe059964c5b68c8497)
</span>---
src/port/port.tcl | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 894850f7a..91135ca15 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;'>@@ -813,7 +813,7 @@ proc get_dep_ports {portname recursive} {
</span> return -code error "Unable to open port $portname: $result"
}
}
<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
# gather its deps
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -858,7 +858,7 @@ proc get_dep_ports {portname recursive} {
</span> ui_error "Unable to open port $depname: $result"
continue
}
<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
# collect its deps
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -923,7 +923,7 @@ proc get_subports {portname} {
</span> return -code error "Unable to open port $portname: $result"
}
}
<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
# gather its subports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1727,7 +1727,7 @@ proc action_info { action portlist opts } {
</span> break_softcontinue "Unable to open port: $result" 1 status
}
dict unset options subport
<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 [dict merge [dict filter $portinfo key portdir porturl] [mportinfo $mport]]
</span> mportclose $mport
} elseif {$portinfo eq ""} {
ui_warn "no PortIndex entry found for $portname"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3414,7 +3414,7 @@ proc action_variants { 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 variants --index does not work with 'current' pseudo-port"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3835,7 +3835,7 @@ proc action_portcmds { action portlist opts } {
</span>
# If not available, get the homepage for the port by opening the Portfile
if {$homepage eq "" && ![catch {set ctx [mportopen $porturl]} result]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [dict merge $portinfo [mportinfo $ctx]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [mportinfo $ctx]
</span> if {[dict exists $portinfo homepage]} {
set homepage [dict get $portinfo homepage]
}
</pre><pre style='margin:0'>
</pre>