<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.11
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/2bd23e458a506311785edee5e4672beee4a87762">https://github.com/macports/macports-base/commit/2bd23e458a506311785edee5e4672beee4a87762</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2bd23e458a506311785edee5e4672beee4a87762
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jun 23 14:48:48 2025 +1000
<span style='display:block; white-space:pre;color:#404040;'> snapshot: handle no actionflags correctly
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This is documented to create a snapshot.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/72628
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit a27de93ec1b5ab5eddab7ed1f89cdab1daa0d4df)
</span>---
src/macports1.0/snapshot.tcl | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/snapshot.tcl b/src/macports1.0/snapshot.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index b18e9cf00..610fce9b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/snapshot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/snapshot.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,29 +54,25 @@ namespace eval snapshot {
</span> # Returns:
# registry::snapshot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![dict exists $opts options_snapshot_order]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set operation "create"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set operation ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach op {list create diff delete export import} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set opname "ports_snapshot_$op"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[dict exists $opts $opname]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$operation ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Only one of the --list, --create, --diff, --delete, --export, or --import options can be specified."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Incorrect usage, see port snapshot --help."
</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;'>- set operation $op
</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;'>-
</span> if {[dict exists $opts ports_snapshot_help]} {
print_usage
return 0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set operation ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach op {list create diff delete export import} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set optname ports_snapshot_$op
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[dict exists $opts $optname]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$operation ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Only one of the --list, --create, --diff, --delete, --export, or --import options can be specified."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Incorrect usage, see port snapshot --help."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set operation $op
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> switch $operation {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "" -
</span> "create" {
if {[catch {create $opts} result]} {
ui_error "Failed to create snapshot: $result"
</pre><pre style='margin:0'>
</pre>