<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/af7bb523e10cc87fe39826ec1256d0b1aae64ecd">https://github.com/macports/mpbb/commit/af7bb523e10cc87fe39826ec1256d0b1aae64ecd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit af7bb523e10cc87fe39826ec1256d0b1aae64ecd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jan 2 04:09:35 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> dependencies.tcl: close mports for activated deps
</span>---
tools/dependencies.tcl | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tools/dependencies.tcl b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 936e133..8eafba3 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tools/dependencies.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -445,11 +445,19 @@ proc install_dep {ditem} {
</span> if {$::failcache_dir ne ""} {
failcache_update $depinfo(name) [ditem_key $ditem porturl] $depinfo(canonical_active_variants) 0
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # The interp delete hack in _mportexec makes the mport more or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # less unusable after installing. Make sure it really gets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # closed even if there are dangling refs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ditem_key $ditem refcnt 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mportclose $ditem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The interp delete hack in _mportexec makes the mport of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependencies basically unusable after installing. Fortunately
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # they should all have been processed previously, being
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # dependencies. Make sure they all get closed now even if there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # are dangling refs. Then mportexec will open fresh copies if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needed later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach mport $macports::open_mports {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set workername [ditem_key $mport workername]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![interp exists $workername]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key $mport refcnt 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mportclose $mport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>