psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing gets on config group names.

Browse source
This commit is contained in:
Dan Helfman 2017-07-22 21:19:26 -07:00
parent 8cf52651fe
commit 2274cfe480
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
borgmatic/commands/borgmatic.py
View file

@ -44,13 +44,17 @@ def main(): # pragma: no cover
args = parse_arguments(*sys.argv[1:]) args = parse_arguments(*sys.argv[1:])
convert.guard_configuration_upgraded(LEGACY_CONFIG_FILENAME, args.config_filename) convert.guard_configuration_upgraded(LEGACY_CONFIG_FILENAME, args.config_filename)
config = validate.parse_configuration(args.config_filename, validate.schema_filename()) config = validate.parse_configuration(args.config_filename, validate.schema_filename())
repository = config.location['repository'] repository = config['location']['repository']
remote_path = config.location['remote_path'] 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.initialize(storage)
borg.create_archive(args.verbosity, config.storage, **config.location) borg.create_archive(args.verbosity, storage, **config['location'])
borg.prune_archives(args.verbosity, repository, config.retention, remote_path=remote_path) borg.prune_archives(args.verbosity, repository, retention, remote_path=remote_path)
borg.check_archives(args.verbosity, repository, config.consistency, remote_path=remote_path) borg.check_archives(args.verbosity, repository, consistency, remote_path=remote_path)
except (ValueError, OSError, CalledProcessError) as error: except (ValueError, OSError, CalledProcessError) as error:
print(error, file=sys.stderr) print(error, file=sys.stderr)
sys.exit(1) sys.exit(1)