From 1ca60bccfba1d1d5929b64d05df0a5654d81e548 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Tue, 3 Nov 2020 13:28:21 +0100 Subject: [PATCH] Refactor condition for MaxRepackBytes Don't depend on the string (opts.MaxRepackSize) for the condition, instead check if there's a (positive) limit configured. --- cmd/restic/cmd_prune.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/restic/cmd_prune.go b/cmd/restic/cmd_prune.go index 3b9f4f505..4fbc5fab7 100644 --- a/cmd/restic/cmd_prune.go +++ b/cmd/restic/cmd_prune.go @@ -390,7 +390,12 @@ 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 := (len(opts.MaxRepackSize) > 0 && stats.size.repack+p.unusedSize+p.usedSize > opts.MaxRepackBytes) + + reachedRepackSize := false + if opts.MaxRepackBytes > 0 { + reachedRepackSize = stats.size.repack+p.unusedSize+p.usedSize > opts.MaxRepackBytes + } + switch { case !reachedRepackSize && (p.duplicateBlobs > 0 || p.tpe == restic.InvalidBlob): // repacking duplicates/mixed is only limited by repackSize