<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.8
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/6b7a5b1f9ffb80ada2f3881dae90d82197394871">https://github.com/macports/macports-base/commit/6b7a5b1f9ffb80ada2f3881dae90d82197394871</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/release-2.8 by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6b7a5b1f9 mportdepends bugfix
</span>6b7a5b1f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6b7a5b1f9ffb80ada2f3881dae90d82197394871
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jan 9 06:45:59 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> mportdepends bugfix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The return value from dlist_match_multi is a list. This is relevant
</span><span style='display:block; white-space:pre;color:#404040;'> when the port was opened without +universal initially and then later
</span><span style='display:block; white-space:pre;color:#404040;'> opened again with it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit 6b422f1ed14c2fd49d0e73ac1147cc17863a558b)
</span>---
src/macports1.0/macports.tcl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 743bd2fa8..f11001bf4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3676,7 +3676,9 @@ proc mportdepends {mport {target {}} {recurseDeps 1} {skipSatisfied 1} {accDeps
</span> # Figure out the depport. Check the open_mports list first, since
# we potentially leak mport references if we mportopen each time,
# because mportexec only closes each open mport once.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set depport [dlist_match_multi $macports::open_mports [list porturl $dep_portinfo(porturl) options $dep_options]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set depport_matches [dlist_match_multi $macports::open_mports [list porturl $dep_portinfo(porturl) options $dep_options]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if multiple matches, the most recently opened one is more likely what we want
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set depport [lindex $depport_matches end]
</span>
if {$depport eq ""} {
# We haven't opened this one yet.
</pre><pre style='margin:0'>
</pre>