<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/ad6792f40c2bb2c8b774e89c5f99e61ea3c07175">https://github.com/macports/macports-base/commit/ad6792f40c2bb2c8b774e89c5f99e61ea3c07175</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 ad6792f40 Use registry2 in action_installed
</span>ad6792f40 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad6792f40c2bb2c8b774e89c5f99e61ea3c07175
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Feb 9 21:12:39 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use registry2 in action_installed
</span>---
src/port/port.tcl | 44 +++++++++++++++++---------------------------
1 file changed, 17 insertions(+), 27 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 1d09b762a..6ee25b522 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;'>@@ -2926,56 +2926,46 @@ proc action_installed { action portlist opts } {
</span> set restrictedList 1
foreachport $portlist {
set composite_version [composite_version $portversion $variations]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {set ilist [concat $ilist [registry::installed $portname $composite_version]]} result] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![string match "* not registered as installed." $result]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break_softcontinue "port installed failed: $result" 1 status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {lappend ilist {*}[registry_installed $portname $composite_version no no]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break_softcontinue "port installed failed: $result" 1 status
</span> }
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [catch {set ilist [registry::installed]} result] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result ne "Registry error: No ports registered as installed."} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "port installed failed: $result"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set status 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {set ilist [registry::entry imaged]} result]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug $::errorInfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "port installed failed: $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set status 1
</span> }
}
if { [llength $ilist] > 0 } {
ui_notice "The following ports are currently installed:"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach i [portlist_sortint $ilist] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set iname [lindex $i 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;'>- set iactive [lindex $i 4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach i [portlist_sortregrefs $ilist] {
</span> set extra ""
if {[macports::ui_isset ports_verbose]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::open_entry $iname $iversion $irevision $ivariants [lindex $i 5]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set rvariants [registry::property_retrieve $regref requested_variants]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set rvariants [$i requested_variants]
</span> if {$rvariants != 0} {
append extra " requested_variants='$rvariants'"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_platform [registry::property_retrieve $regref os_platform]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_major [registry::property_retrieve $regref os_major]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_platform [$i os_platform]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_major [$i os_major]
</span> if {$os_platform != 0 && $os_platform ne "" && $os_major != 0 && $os_major ne ""} {
append extra " platform='$os_platform $os_major'"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set archs [registry::property_retrieve $regref archs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set archs [$i archs]
</span> if {$archs != 0 && $archs ne ""} {
append extra " archs='$archs'"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set date [registry::property_retrieve $regref date]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set date [$i date]
</span> if {$date ne ""} {
append extra " date='[clock format $date -format "%Y-%m-%dT%H:%M:%S%z"]'"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $iactive == 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts " $iname @${iversion}_${irevision}${ivariants}${extra}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { $iactive == 1 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts " $iname @${iversion}_${irevision}${ivariants} (active)${extra}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set activestr ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[$i state] eq "installed"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set activestr " (active)"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts " [$i name] @[$i version]_[$i revision][$i variants]${activestr}${extra}"
</span> }
} elseif { $restrictedList } {
ui_notice "None of the specified ports are installed."
</pre><pre style='margin:0'>
</pre>