<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/0a98227eda013f3324125e2ef0171e9de8b9342d">https://github.com/macports/macports-base/commit/0a98227eda013f3324125e2ef0171e9de8b9342d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0a98227ed Use registry2 in action_{activate,deactivate}
</span>0a98227ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a98227eda013f3324125e2ef0171e9de8b9342d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 9 02:11:17 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use registry2 in action_{activate,deactivate}
</span>---
src/port/port.tcl | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port/port.tcl b/src/port/port.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f53f88f4..ecd5d81f2 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port/port.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2149,7 +2149,6 @@ proc action_provides { action portlist opts } {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- registry::close_file_map
</span>
return 0
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2163,11 +2162,8 @@ proc action_activate { action portlist opts } {
</span> foreachport $portlist {
set composite_version [composite_version $portversion $variations]
if {![dict exists $options ports_activate_no-exec]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set ilist [registry::installed $portname $composite_version]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [llength $ilist] == 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![catch {registry_installed $portname $composite_version} regref]} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lindex $ilist 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::entry open $portname [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]
</span> if {[$regref installtype] eq "image" && [registry::run_target $regref activate $options]} {
continue
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2195,17 +2191,13 @@ proc action_deactivate { action portlist opts } {
</span> foreachport $portlist {
set composite_version [composite_version $portversion $variations]
if {![dict exists $options ports_deactivate_no-exec]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set ilist [registry::active $portname]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ![catch {registry::entry installed $portname} ilist]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [llength $ilist] == 1} {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lindex $ilist 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iversion [lindex $i 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set irevision [lindex $i 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ivariants [lindex $i 3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$composite_version eq "" || $composite_version eq "${iversion}_${irevision}${ivariants}"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::entry open $portname $iversion $irevision $ivariants [lindex $i 5]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[$regref installtype] eq "image" && [registry::run_target $regref deactivate $options]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regref [lindex $ilist 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {($composite_version eq "" || $composite_version eq "[$regref version]_[$regref revision][$regref variants]")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && [$regref installtype] eq "image" && [registry::run_target $regref deactivate $options]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span> }
}
if {![macports::global_option_isset ports_dryrun]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3171,7 +3163,6 @@ proc action_contents { action portlist opts } {
</span> ui_notice "Port $portname is not installed."
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- registry::close_file_map
</span>
return 0
}
</pre><pre style='margin:0'>
</pre>