upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-07-15 13:06:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Simplifies retention granularity ordering check

Browse source
This commit is contained in:
Hugo Wallenburg 2026-06-06 23:55:00 +02:00
parent 304a2fa5b9
commit d9b35f2eeb
No known key found for this signature in database
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/borg/archiver/prune_cmd.py
View file

@ -309,12 +309,7 @@ class PruneMixIn:
f"useless since every archive matched by {hi_arg} would have already been matched by {lo_arg}."
)
prune_keys = {rule.key for rule in PRUNING_RULES}
interval_args = [
(arg, val)
for arg, val in keep_args.items()
if arg in prune_keys and (isinstance(val, timedelta) or val == -1)
]
interval_args = [(arg, val) for arg, val in keep_args.items() if isinstance(val, timedelta) or val == -1]
for (lo_arg, lo_val), (hi_arg, hi_val) in combinations(interval_args, 2):
if hi_val == -1:
# 'Infinity' is always bigger
@ -323,11 +318,7 @@ class PruneMixIn:
if lo_val == -1 or lo_val >= hi_val:
raise CommandError(lo_hi_mismatch_errmsg(lo_arg, lo_val, hi_arg, hi_val))
int_args = [
(arg, val)
for arg, val in keep_args.items()
if any((arg == r.key for r in PRUNING_RULES)) and isinstance(val, int)
]
int_args = [(arg, val) for arg, val in keep_args.items() if isinstance(val, int)]
for (lo_arg, lo_val), (hi_arg, hi_val) in combinations(int_args, 2):
if lo_val == -1:
raise CommandError(lo_hi_mismatch_errmsg(lo_arg, lo_val, hi_arg, hi_val))