TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-11 18:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

forget/snapshots: properly change error returned by PrintSnapshots

Browse Source
This commit is contained in:
Michael Eischer
2025-09-17 21:16:39 +02:00
parent 364271c6c3
commit 2a9105c050
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/restic/cmd_forget.go
View File

@@ -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)

8
cmd/restic/cmd_snapshots.go
View File

@@ -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
}
}