<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/27d8c55b2e9991b3e90fa630b56e51474f0ae97a">https://github.com/macports/macports-base/commit/27d8c55b2e9991b3e90fa630b56e51474f0ae97a</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 27d8c55b2 Use registry2 in action_outdated
</span>27d8c55b2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 27d8c55b2e9991b3e90fa630b56e51474f0ae97a
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 11 01:54:26 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use registry2 in action_outdated
</span>---
src/port/port.tcl | 55 +++++++++++++++++++++----------------------------------
1 file changed, 21 insertions(+), 34 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 6ee25b522..35a7ca816 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;'>@@ -2988,38 +2988,32 @@ proc action_outdated { action portlist opts } {
</span> foreach portspec $portlist {
set portname [dict get $portspec name]
set composite_version [composite_version [dict get $portspec version] [dict get $portspec variants]]
<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 outdated failed: $result" 1 status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><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:#e0ffe0;'>+ if {[catch {lappend ilist {*}[registry_installed $portname $composite_version no yes]} result]} {
</span> ui_debug $::errorInfo
<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:#e0ffe0;'>+ break_softcontinue "port outdated failed: $result" 1 status
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[catch {set ilist [registry::entry installed]} 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 outdated failed: $result"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set status 1
</span> }
set num_outdated 0
if { [llength $ilist] > 0 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach i [portlist_sortint $ilist] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${macports::cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrong_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set wrong_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach i [portlist_sortregrefs $ilist] {
</span>
# Get information about the installed port
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portname [lindex $i 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_version [lindex $i 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set installed_revision [lindex $i 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set portname [$i name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_version [$i version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_revision [$i revision]
</span> set installed_compound "${installed_version}_${installed_revision}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set is_active [lindex $i 4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$is_active == 0} {
</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:#ffe0e0;'>- set installed_epoch [lindex $i 5]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set installed_epoch [$i epoch]
</span>
# Get info about the port from the index
if {[catch {set res [mportlookup $portname]} result]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3063,23 +3057,16 @@ proc action_outdated { action portlist opts } {
</span> }
set comp_result $epoch_comp_result
} elseif {$comp_result == 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set regref [registry::open_entry $portname $installed_version $installed_revision [lindex $i 3] $installed_epoch]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_platform_installed [registry::property_retrieve $regref os_platform]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set os_major_installed [registry::property_retrieve $regref os_major]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_platform_installed [$i os_platform]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set os_major_installed [$i os_major]
</span> if {$os_platform_installed ni [list any "" 0] && $os_major_installed ni [list "" 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- && ($os_platform_installed != ${macports::os_platform}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && ($os_platform_installed ne ${macports::os_platform}
</span> || ($os_major_installed ne "any" && $os_major_installed != ${macports::os_major}))} {
set comp_result -1
set reason { (platform $os_platform_installed $os_major_installed != ${macports::os_platform} ${macports::os_major})}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set cxx_stdlib_installed [registry::property_retrieve $regref cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set cxx_stdlib_overridden [registry::property_retrieve $regref cxx_stdlib_overridden]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${macports::cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wrong_stdlib libstdc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set wrong_stdlib libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$cxx_stdlib_overridden == 0 && $cxx_stdlib_installed eq $wrong_stdlib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set cxx_stdlib_installed [$i cxx_stdlib]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[$i cxx_stdlib_overridden] == 0 && $cxx_stdlib_installed eq $wrong_stdlib} {
</span> set comp_result -1
set reason { (C++ stdlib $cxx_stdlib_installed != ${macports::cxx_stdlib})}
}
</pre><pre style='margin:0'>
</pre>