diff --git a/changelog/unreleased/pull-3591 b/changelog/unreleased/pull-3591 new file mode 100644 index 000000000..c533233c9 --- /dev/null +++ b/changelog/unreleased/pull-3591 @@ -0,0 +1,8 @@ +Bugfix: Fix handling of `prune --max-repack-size=0` + +Restic ignored the `--max-repack-size` option when passing a value of 0. This +has been fixed. + +As a workaround, `--max-repack-size=1` can be used with older versions of restic. + +https://github.com/restic/restic/pull/3591 diff --git a/cmd/restic/cmd_prune.go b/cmd/restic/cmd_prune.go index d621afdad..82635f21a 100644 --- a/cmd/restic/cmd_prune.go +++ b/cmd/restic/cmd_prune.go @@ -66,6 +66,7 @@ func addPruneOptions(c *cobra.Command) { } func verifyPruneOptions(opts *PruneOptions) error { + opts.MaxRepackBytes = math.MaxUint64 if len(opts.MaxRepackSize) > 0 { size, err := parseSizeStr(opts.MaxRepackSize) if err != nil { @@ -418,11 +419,7 @@ func prune(opts PruneOptions, gopts GlobalOptions, repo restic.Repository, usedB for _, p := range repackCandidates { reachedUnusedSizeAfter := (stats.size.unused-stats.size.remove-stats.size.repackrm < maxUnusedSizeAfter) - - reachedRepackSize := false - if opts.MaxRepackBytes > 0 { - reachedRepackSize = stats.size.repack+p.unusedSize+p.usedSize > opts.MaxRepackBytes - } + reachedRepackSize := stats.size.repack+p.unusedSize+p.usedSize >= opts.MaxRepackBytes switch { case reachedRepackSize: