octoleo
/
restic
mirror of https://github.com/octoleo/restic.git
2
2
Fork 0
Code Issues Releases Wiki Activity

rewrite: cleanup err handling and output

This commit is contained in:
Michael Eischer 2022-09-09 22:38:58 +02:00
parent ad14d6e4ac
commit 327f418a9c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/restic/cmd_rewrite.go
View File

@ -71,7 +71,7 @@ func init() {
initExcludePatternOptions(f, &rewriteOptions.excludePatternOptions) initExcludePatternOptions(f, &rewriteOptions.excludePatternOptions)
} }
func rewriteSnapshot(ctx context.Context, repo *repository.Repository, sn *restic.Snapshot, opts RewriteOptions, gopts GlobalOptions) (bool, error) { func rewriteSnapshot(ctx context.Context, repo *repository.Repository, sn *restic.Snapshot, opts RewriteOptions) (bool, error) {
if sn.Tree == nil { if sn.Tree == nil {
return false, errors.Errorf("snapshot %v has nil tree", sn.ID().Str()) return false, errors.Errorf("snapshot %v has nil tree", sn.ID().Str())
} }
@ -117,7 +117,7 @@ func rewriteSnapshot(ctx context.Context, repo *repository.Repository, sn *resti
debug.Log("Snapshot %v modified", sn) debug.Log("Snapshot %v modified", sn)
if opts.DryRun { if opts.DryRun {
Printf("Would modify snapshot: %s\n", sn.String()) Verbosef("would save new snapshot\n")
return true, nil return true, nil
} }
@ -145,7 +145,7 @@ func rewriteSnapshot(ctx context.Context, repo *repository.Repository, sn *resti
debug.Log("old snapshot %v removed", sn.ID()) debug.Log("old snapshot %v removed", sn.ID())
} }
Printf("new snapshot saved as %v\n", id) Verbosef("new snapshot saved as %v\n", id)
return true, nil return true, nil
} }
@ -183,24 +183,24 @@ func runRewrite(ctx context.Context, opts RewriteOptions, gopts GlobalOptions, a
changedCount := 0 changedCount := 0
for sn := range FindFilteredSnapshots(ctx, snapshotLister, repo, opts.Hosts, opts.Tags, opts.Paths, args) { for sn := range FindFilteredSnapshots(ctx, snapshotLister, repo, opts.Hosts, opts.Tags, opts.Paths, args) {
Verbosef("Checking snapshot %s\n", sn.String()) Verbosef("\nsnapshot %s of %v at %s)\n", sn.ID().Str(), sn.Paths, sn.Time)
changed, err := rewriteSnapshot(ctx, repo, sn, opts, gopts) changed, err := rewriteSnapshot(ctx, repo, sn, opts)
if err != nil { if err != nil {
Warnf("unable to rewrite snapshot ID %q, ignoring: %v\n", sn.ID(), err) return errors.Fatalf("unable to rewrite snapshot ID %q: %v", sn.ID().Str(), err)
continue
} }
if changed { if changed {
changedCount++ changedCount++
} }
} }
Verbosef("\n")
if changedCount == 0 { if changedCount == 0 {
Verbosef("no snapshots modified\n") Verbosef("no snapshots were modified\n")
} else { } else {
if !opts.DryRun { if !opts.DryRun {
Verbosef("modified %v snapshots\n", changedCount) Verbosef("modified %v snapshots\n", changedCount)
} else { } else {
Verbosef("dry run. would modify %v snapshots\n", changedCount) Verbosef("would modify %v snapshots\n", changedCount)
} }
} }