<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/ce53e200e67a997e4dca46fe85aad5435b9db5d5">https://github.com/macports/macports-base/commit/ce53e200e67a997e4dca46fe85aad5435b9db5d5</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 ce53e200e Use registry2 in action_uninstall
</span>ce53e200e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce53e200e67a997e4dca46fe85aad5435b9db5d5
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 9 18:33:23 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use registry2 in action_uninstall
</span>---
src/port/port.tcl | 8 ++------
1 file changed, 2 insertions(+), 6 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 a90c9abc7..6505f62e1 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;'>@@ -2886,7 +2886,7 @@ proc action_uninstall { action portlist opts } {
</span> set portlist [portlist_sortdependents $portlist]
foreachport $portlist {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![registry::entry_exists_for_name $portname]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[registry::entry imaged $portname] eq ""} {
</span> # if the code path arrives here the port either isn't installed, or
# it doesn't exist at all. We can't be sure, but we can check the
# portindex whether a port by that name exists (in which case not
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2900,12 +2900,8 @@ proc action_uninstall { action portlist opts } {
</span> }
set composite_version [composite_version $portversion $variations]
if {![dict exists $options ports_uninstall_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 iactive [lindex $i 4]
</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 {[registry::run_target $regref uninstall $options]} {
continue
}
</pre><pre style='margin:0'>
</pre>