<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository mpbb.
</pre>
<p><a href="https://github.com/macports/mpbb/commit/e4617a57e72bef925a78557074b75461e219cd5e">https://github.com/macports/mpbb/commit/e4617a57e72bef925a78557074b75461e219cd5e</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 e4617a5 Merge portinfo dicts to keep porturl
</span>e4617a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e4617a57e72bef925a78557074b75461e219cd5e
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Feb 26 19:39:12 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Merge portinfo dicts to keep porturl
</span>---
tools/sort-with-subports.tcl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/sort-with-subports.tcl b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index be61dd8..ac6f56b 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/sort-with-subports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -237,7 +237,7 @@ while {[llength $todo] > 0} {
</span> if {![catch {mportopen [dict get $portinfo porturl] [dict create subport [dict get $portinfo name]] ""} result]} {
set opened 1
set mport $result
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [mportinfo $mport]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [dict merge $portinfo [mportinfo $mport]]
</span> if {![dict exists $portinfo canonical_active_variants]} {
puts stderr "Warning: [dict get $portinfo name] has no canonical_active_variants"
dict set outputports $p 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -255,7 +255,7 @@ while {[llength $todo] > 0} {
</span> if {$opened != 1} {
set opened 1
set mport $result
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [mportinfo $mport]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [dict merge $portinfo [mportinfo $mport]]
</span> }
set workername [ditem_key $mport workername]
set archive_name [$workername eval {get_portimage_name}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -304,7 +304,7 @@ while {[llength $todo] > 0} {
</span> if {$opened != 1} {
set opened 1
set mport $result
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portinfo [mportinfo $mport]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portinfo [dict merge $portinfo [mportinfo $mport]]
</span> }
set supported_archs [_mportkey $mport supported_archs]
switch $::macports::os_arch {
</pre><pre style='margin:0'>
</pre>