2
0
Эх сурвалжийг харах

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

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.
Dan Helfman 7 жил өмнө
parent
commit
4538017206

+ 5 - 2
borgmatic/commands/borgmatic.py

@@ -115,7 +115,9 @@ def run_configuration(config_filename, args):  # pragma: no cover
         local_path = location.get('local_path', 'borg')
         remote_path = location.get('remote_path')
         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']:
             repository = os.path.expanduser(unexpanded_repository)
@@ -171,7 +173,8 @@ def run_configuration(config_filename, args):  # pragma: no cover
                     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):
         hook.execute_hook(hooks.get('on_error'), config_filename, 'on-error')
         raise