<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/9f44182643a4c9c33567ed002da13d7399646d75">https://github.com/macports/macports-base/commit/9f44182643a4c9c33567ed002da13d7399646d75</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 9f4418264 add_ports_to_portlist: use dict merge
</span>9f4418264 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f44182643a4c9c33567ed002da13d7399646d75
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 11 08:12:41 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> add_ports_to_portlist: use dict merge
</span>---
src/portlist1.0/portlist.tcl | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/portlist1.0/portlist.tcl b/src/portlist1.0/portlist.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 545942611..6878503eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/portlist1.0/portlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/portlist1.0/portlist.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,13 +88,10 @@ proc add_ports_to_portlist {listname ports {overrides ""}} {
</span> upvar $listname portlist
# Add each entry to the named portlist, overriding any values
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # specified as overrides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specified as overrides (typically version, variants,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # requested_variants, options).
</span> foreach portentry $ports {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # typically version, variants, requested_variants, options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach key [dict keys $overrides] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict set portentry $key [dict get $overrides $key]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_to_portlist portlist $portentry
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_to_portlist portlist [dict merge $portentry $overrides]
</span> }
}
</pre><pre style='margin:0'>
</pre>