<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/40082e28a6c815e6a32b1399a1e0d2ff6a4e99c9">https://github.com/macports/macports-base/commit/40082e28a6c815e6a32b1399a1e0d2ff6a4e99c9</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 40082e28a Use registry2 in action_space
</span>40082e28a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40082e28a6c815e6a32b1399a1e0d2ff6a4e99c9
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Feb 11 03:06:38 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> Use registry2 in action_space
</span>---
src/port/port.tcl | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 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 856dedc3c..5a0c408af 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;'>@@ -3188,27 +3188,31 @@ proc action_space {action portlist opts} {
</span> set spaceall 0.0
foreachport $portlist {
set space 0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set files [registry::port_registered $portname]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $files != 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [llength $files] > 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file $files {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set space [expr {$space + [file size $file]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set regref [lindex [registry::entry installed $portname] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$regref eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Port $portname is not active."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$portversion ne "" && $portversion ne "[$regref version]_[$regref revision]"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Active version of [$regref name] is not $portversion but [$regref version]_[$regref revision]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set files [$regref files]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$files != 0 && [llength $files] > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach file $files {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set space [expr {$space + [file size $file]}]
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![dict exists $options ports_space_total] || [dict get $options ports_space_total] ne "yes"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set msg "[bytesize $space $units] $portname"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { $portversion ne {} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append msg " @$portversion"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $msg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![dict exists $options ports_space_total] || [dict get $options ports_space_total] ne "yes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set msg "[bytesize $space $units] $portname"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { $portversion ne {} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append msg " @[$regref version]_[$regref revision][$regref variants]"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set spaceall [expr {$space + $spaceall}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Port $portname does not contain any file or is not active."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts $msg
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set spaceall [expr {$space + $spaceall}]
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts stderr "Port $portname is not installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts stderr "Port $portname does not have any files registered."
</span> }
}
if {[llength $portlist] > 1 || ([dict exists $options ports_space_total] && [dict get $options ports_space_total] eq "yes")} {
</pre><pre style='margin:0'>
</pre>