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

Merge branch 'fix-72-hooks-are-executed-when-list-or-info' of thomasleveil/borgmatic into master

Browse source 
Thanks for fixing this!

I agree about more specific hooks if and when `--check` or `--prune`-specific hook use cases are needed. I think what you've done here is fine until then.
This commit is contained in:
Dan Helfman 2018-07-01 21:47:39 +00:00 committed by Gitea
commit 4538017206
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
borgmatic/commands/borgmatic.py
View file

@ -115,7 +115,9 @@ def run_configuration(config_filename, args): # pragma: no cover
local_path = location.get('local_path', 'borg') local_path = location.get('local_path', 'borg')
remote_path = location.get('remote_path') remote_path = location.get('remote_path')
borg_create.initialize_environment(storage) borg_create.initialize_environment(storage)
hook.execute_hook(hooks.get('before_backup'), config_filename, 'pre-backup')
if args.create:
hook.execute_hook(hooks.get('before_backup'), config_filename, 'pre-backup')
for unexpanded_repository in location['repositories']: for unexpanded_repository in location['repositories']:
repository = os.path.expanduser(unexpanded_repository) repository = os.path.expanduser(unexpanded_repository)
@ -171,7 +173,8 @@ def run_configuration(config_filename, args): # pragma: no cover
remote_path=remote_path, remote_path=remote_path,
) )
hook.execute_hook(hooks.get('after_backup'), config_filename, 'post-backup') if args.create:
hook.execute_hook(hooks.get('after_backup'), config_filename, 'post-backup')
except (OSError, CalledProcessError): except (OSError, CalledProcessError):
hook.execute_hook(hooks.get('on_error'), config_filename, 'on-error') hook.execute_hook(hooks.get('on_error'), config_filename, 'on-error')
raise raise