From 2a9105c050bdf8258facff3aa202c2f751c69c4a Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Wed, 17 Sep 2025 21:16:39 +0200 Subject: [PATCH] forget/snapshots: properly change error returned by PrintSnapshots --- cmd/restic/cmd_forget.go | 8 ++++++-- cmd/restic/cmd_snapshots.go | 8 +++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/restic/cmd_forget.go b/cmd/restic/cmd_forget.go index 850417c9c..1c79cb2c0 100644 --- a/cmd/restic/cmd_forget.go +++ b/cmd/restic/cmd_forget.go @@ -276,14 +276,18 @@ func runForget(ctx context.Context, opts ForgetOptions, pruneOptions PruneOption } if len(keep) != 0 && !gopts.Quiet && !gopts.JSON { printer.P("keep %d snapshots:\n", len(keep)) - PrintSnapshots(globalOptions.stdout, keep, reasons, opts.Compact) + if err := PrintSnapshots(globalOptions.stdout, keep, reasons, opts.Compact); err != nil { + return err + } printer.P("\n") } fg.Keep = asJSONSnapshots(keep) if len(remove) != 0 && !gopts.Quiet && !gopts.JSON { printer.P("remove %d snapshots:\n", len(remove)) - PrintSnapshots(globalOptions.stdout, remove, nil, opts.Compact) + if err := PrintSnapshots(globalOptions.stdout, remove, nil, opts.Compact); err != nil { + return err + } printer.P("\n") } fg.Remove = asJSONSnapshots(remove) diff --git a/cmd/restic/cmd_snapshots.go b/cmd/restic/cmd_snapshots.go index 99c00f68a..5ce82c996 100644 --- a/cmd/restic/cmd_snapshots.go +++ b/cmd/restic/cmd_snapshots.go @@ -120,14 +120,12 @@ func runSnapshots(ctx context.Context, opts SnapshotOptions, gopts GlobalOptions if grouped { err := PrintSnapshotGroupHeader(globalOptions.stdout, k) if err != nil { - printer.E("error printing snapshots: %v", err) - return nil + return err } } - err = PrintSnapshots(globalOptions.stdout, list, nil, opts.Compact) + err := PrintSnapshots(globalOptions.stdout, list, nil, opts.Compact) if err != nil { - printer.E("error printing snapshots: %v", err) - return nil + return err } }