mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2025-03-11 14:49:16 +00:00
Code Issues Releases Wiki Activity

Correctly supply prune pattern for borg >=1.2.2 (#1565)

Browse source 
Adds different behaviour when borg version >=1.2.2 but <2.0.0: The prune pattern is supplied without a style prefix like `sh:`.
Fixes #1564.

---------

Co-authored-by: herrwusel <herrwusel@user.noreply.github.com>
Co-authored-by: yfprojects <62463991+real-yfprojects@users.noreply.github.com>
This commit is contained in:
herrwusel 2023-02-06 22:02:55 +01:00 • committed by GitHub
parent a4ab7e713a
commit ffafcee05c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vorta/borg/prune.py
View file

@ -47,8 +47,10 @@ class BorgPruneJob(BorgJob):
if profile.prune_prefix: if profile.prune_prefix:
formatted_prune_prefix = format_archive_name(profile, profile.prune_prefix) formatted_prune_prefix = format_archive_name(profile, profile.prune_prefix)
if borg_compat.check('V122'): if borg_compat.check('V2'):
pruning_opts += ['-a', 'sh:' + formatted_prune_prefix + '*'] pruning_opts += ['-a', f"sh:{formatted_prune_prefix}*"]
elif borg_compat.check('V122'):
pruning_opts += ['-a', f"{formatted_prune_prefix}*"]
else: else:
pruning_opts += ['--prefix', formatted_prune_prefix] pruning_opts += ['--prefix', formatted_prune_prefix]