<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/5ca6a0a9191d0a7d7e54adbb7e05c10b601e0241">https://github.com/macports/mpbb/commit/5ca6a0a9191d0a7d7e54adbb7e05c10b601e0241</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5ca6a0a9191d0a7d7e54adbb7e05c10b601e0241
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed May 11 22:04:43 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> dependencies.tcl: try to avoid broken mport refs
</span>---
tools/dependencies.tcl | 9 +++++++--
1 file changed, 7 insertions(+), 2 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 2860326..872acb0 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;'>@@ -315,6 +315,7 @@ proc deactivate_unneeded {portinfovar} {
</span> # earlier - it most likely won't be used again (and will be
# reopened in the uncommon case that it is needed.)
foreach e [registry::entry installed] {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key $mports_array([$e name]) refcnt 1
</span> mportclose $mports_array([$e name])
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -413,7 +414,11 @@ proc install_dep {ditem} {
</span> if {[registry::entry imaged $depinfo(name) $depinfo(version) $depinfo(revision) $depinfo(canonical_active_variants)] ne ""} {
puts "Already installed, nothing to do"
puts $::log_status_dependencies {[OK]}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ditem_key $ditem refcnt 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mportclose $ditem
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return
</span> }
set fail 0
set workername [ditem_key $ditem workername]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -500,7 +505,7 @@ proc install_dep {ditem} {
</span> # needed later.
foreach mport $macports::open_mports {
set workername [ditem_key $mport workername]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![interp exists $workername]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$workername eq "" || ![interp exists $workername]} {
</span> ditem_key $mport refcnt 1
mportclose $mport
}
</pre><pre style='margin:0'>
</pre>