From 14d587876e3754d15b3926cf95f6df59f0ccfa84 Mon Sep 17 00:00:00 2001 From: real-yfprojects Date: Tue, 11 Oct 2022 20:03:05 +0200 Subject: [PATCH] Replace `--prefix` with `-a` for borg v1.2.2 also. * src/vorta/borg/prune.py (BorgPruneJob.prepare) --- src/vorta/borg/prune.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vorta/borg/prune.py b/src/vorta/borg/prune.py index 5973c22c..bf86a5cb 100644 --- a/src/vorta/borg/prune.py +++ b/src/vorta/borg/prune.py @@ -1,5 +1,5 @@ from vorta.store.models import RepoModel -from vorta.utils import format_archive_name +from vorta.utils import borg_compat, format_archive_name from .borg_job import BorgJob @@ -46,7 +46,11 @@ class BorgPruneJob(BorgJob): if profile.prune_prefix: formatted_prune_prefix = format_archive_name(profile, profile.prune_prefix) - pruning_opts += ['--prefix', formatted_prune_prefix] + + if borg_compat.check('V122'): + pruning_opts += ['-a', formatted_prune_prefix + '*'] # sh: pattern + else: + pruning_opts += ['--prefix', formatted_prune_prefix] if profile.prune_keep_within: pruning_opts += ['--keep-within', profile.prune_keep_within]