<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/e12d52d7a1446b2c76c6aeffea747cbc83e9e8cc">https://github.com/macports/macports-base/commit/e12d52d7a1446b2c76c6aeffea747cbc83e9e8cc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e12d52d7a1446b2c76c6aeffea747cbc83e9e8cc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Sep 13 00:40:28 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> Don't error on inactive ports in recursive_collect_deps
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62813
</span>---
src/port1.0/portutil.tcl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 71900de35..b78b7e8a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1643,8 +1643,12 @@ proc target_run {ditem} {
</span> proc recursive_collect_deps {portname {depsfound {}}} \
{
# Get the active port from the registry
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # There can be only one port active at a time, so take the first result only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set regentry [lindex [registry_active $portname] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {registry_active $portname} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "recursive_collect_deps: '$portname' is registered as a dependency but is not active"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return $depsfound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There can be only one port version active at a time, so take the first result only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regentry [lindex $result 0]
</span> # Get port dependencies from the registry
set deplist [registry_list_depends [lindex $regentry 0] [lindex $regentry 1] [lindex $regentry 2] [lindex $regentry 3]]
</pre><pre style='margin:0'>
</pre>