<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/0ba7042204e6af6b04654165bd3af96a11a397dd">https://github.com/macports/macports-base/commit/0ba7042204e6af6b04654165bd3af96a11a397dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0ba7042204e6af6b04654165bd3af96a11a397dd
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Feb 12 01:07:24 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> upgrade: avoid redundant registry::entry open
</span>---
src/macports1.0/macports.tcl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
<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 a110f4892..b4609686f 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;'>@@ -4258,10 +4258,14 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> set revision_installed $revision
set variant_installed $variant
set epoch_installed $epoch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!$anyactive} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regref $i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[$i state] eq "installed"} {
set anyactive yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regref $i
</span> set version_active $version
set revision_active $revision
set variant_active $variant
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4277,11 +4281,9 @@ proc macports::_upgrade {portname dspec variationslist optionslist {depscachenam
</span> ui_debug "$portname ${version_active}_$revision_active $variant_active is active"
# save existing variant for later use
set oldvariant $variant_active
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::entry open $portname $version_active $revision_active $variant_active $epoch_active]
</span> } else {
ui_debug "no version of $portname is active"
set oldvariant $variant_installed
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::entry open $portname $version_installed $revision_installed $variant_installed $epoch_installed]
</span> }
set oldrequestedvariant [$regref requested_variants]
if {$oldrequestedvariant == 0} {
</pre><pre style='margin:0'>
</pre>