<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e0dfca840a15bf3e7f1ad58b0c6fb0c6ac7c92fb">https://github.com/macports/macports-ports/commit/e0dfca840a15bf3e7f1ad58b0c6fb0c6ac7c92fb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e0dfca840a15bf3e7f1ad58b0c6fb0c6ac7c92fb
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Jul 11 00:19:31 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> mpstats: validate args and config early
</span>---
sysutils/mpstats/files/mpstats.tcl | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/mpstats/files/mpstats.tcl b/sysutils/mpstats/files/mpstats.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 5df65f7c3b1..c24aaecfbc9 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/mpstats/files/mpstats.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/mpstats/files/mpstats.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -223,14 +223,27 @@ proc get_installed_ports {active} {
</span> # @returns
# 0 on success and a non-zero value on error
proc action_stats {subcommands} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global stats_url stats_id
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If no subcommands are given (subcommands is empty) print out usage message
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength $subcommands] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If no subcommand is given (subcommands is empty), or multiple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # subcommands are given, print out usage message.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set subcommands_len [llength $subcommands]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subcommands_len != 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$subcommands_len > 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Please select only one subcommand."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> usage
return 1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ global stats_url stats_id
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists stats_url]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Configuration variable stats_url is not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists stats_id]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Configuration variable stats_id is not set"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Build dictionary of os information
dict set os macports_version [macports::version]
dict set os osx_version ${macports::macos_version_major}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -245,22 +258,6 @@ proc action_stats {subcommands} {
</span> # Build dictionary of port information
dict set ports active [get_installed_ports yes]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure there aren't too many subcommands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[llength $subcommands] > 1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Please select only one subcommand."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- usage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</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;'>- if {![info exists stats_url]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Configuration variable stats_url is not set"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists stats_id]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Configuration variable stats_id is not set"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Get the subcommand
set cmd [lindex $subcommands 0]
# Use compact form for submission.
</pre><pre style='margin:0'>
</pre>