From 2274cfe480c8437339f93540d267523ddde7d245 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sat, 22 Jul 2017 21:19:26 -0700 Subject: [PATCH] Fixing gets on config group names. --- borgmatic/commands/borgmatic.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 9bde8bc4b..c37b8915d 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -44,13 +44,17 @@ def main(): # pragma: no cover args = parse_arguments(*sys.argv[1:]) convert.guard_configuration_upgraded(LEGACY_CONFIG_FILENAME, args.config_filename) config = validate.parse_configuration(args.config_filename, validate.schema_filename()) - repository = config.location['repository'] - remote_path = config.location['remote_path'] + repository = config['location']['repository'] + remote_path = config['location']['remote_path'] + (storage, retention, consistency) = ( + config.get(group_name, {}) + for group_name in ('storage', 'retention', 'consistency') + ) - borg.initialize(config.storage) - borg.create_archive(args.verbosity, config.storage, **config.location) - borg.prune_archives(args.verbosity, repository, config.retention, remote_path=remote_path) - borg.check_archives(args.verbosity, repository, config.consistency, remote_path=remote_path) + borg.initialize(storage) + borg.create_archive(args.verbosity, storage, **config['location']) + borg.prune_archives(args.verbosity, repository, retention, remote_path=remote_path) + borg.check_archives(args.verbosity, repository, consistency, remote_path=remote_path) except (ValueError, OSError, CalledProcessError) as error: print(error, file=sys.stderr) sys.exit(1)