From a26065064d4d38f5beaf23cc1f18345d801c3313 Mon Sep 17 00:00:00 2001 From: Elmar Hoffmann Date: Sun, 23 Jun 2019 02:03:04 +0200 Subject: [PATCH] enable placeholder usage in all extra archive arguments --- src/borg/archiver.py | 6 ++---- src/borg/helpers/parseformat.py | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index a7ad42d2f..8fb6439d5 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1071,8 +1071,7 @@ def print_output(diff, path): @with_archive def do_rename(self, args, repository, manifest, key, cache, archive): """Rename an existing archive""" - name = replace_placeholders(args.name) - archive.rename(name) + archive.rename(args.name) manifest.write() repository.commit(compact=False) cache.commit() @@ -1545,11 +1544,10 @@ def do_recreate(self, args, repository, manifest, key, cache): if args.location.archive: name = args.location.archive - target = replace_placeholders(args.target) if args.target else None if recreater.is_temporary_archive(name): self.print_error('Refusing to work on temporary archive of prior recreate: %s', name) return self.exit_code - if not recreater.recreate(name, args.comment, target): + if not recreater.recreate(name, args.comment, args.target): self.print_error('Nothing to do. Archive was not processed.\n' 'Specify at least one pattern, PATH, --comment, re-compression or re-chunking option.') else: diff --git a/src/borg/helpers/parseformat.py b/src/borg/helpers/parseformat.py index 3f469e2bb..347324e54 100644 --- a/src/borg/helpers/parseformat.py +++ b/src/borg/helpers/parseformat.py @@ -498,6 +498,7 @@ def validator(text): def archivename_validator(): def validator(text): + text = replace_placeholders(text) if '/' in text or '::' in text or not text: raise argparse.ArgumentTypeError('Invalid repository name: "%s"' % text) return text