diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 105b4c2b..d20d1c0d 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -65,35 +65,34 @@ def run_configuration(config_filename, config, arguments): '{}: Failed to acquire lock'.format(config_filename), error ) - if not encountered_error: - if 'create' in arguments: - try: - dispatch.call_hooks( - 'ping_monitor', - hooks, - config_filename, - monitor.MONITOR_HOOK_NAMES, - monitor.State.START, - global_arguments.dry_run, - ) - command.execute_hook( - hooks.get('before_backup'), - hooks.get('umask'), - config_filename, - 'pre-backup', - global_arguments.dry_run, - ) - dispatch.call_hooks( - 'dump_databases', - hooks, - config_filename, - dump.DATABASE_HOOK_NAMES, - global_arguments.dry_run, - ) - except (OSError, CalledProcessError) as error: - encountered_error = error - yield from make_error_log_records( - '{}: Error running pre-backup hook'.format(config_filename), error + if not encountered_error and 'create' in arguments: + try: + dispatch.call_hooks( + 'ping_monitor', + hooks, + config_filename, + monitor.MONITOR_HOOK_NAMES, + monitor.State.START, + global_arguments.dry_run, + ) + command.execute_hook( + hooks.get('before_backup'), + hooks.get('umask'), + config_filename, + 'pre-backup', + global_arguments.dry_run, + ) + dispatch.call_hooks( + 'dump_databases', + hooks, + config_filename, + dump.DATABASE_HOOK_NAMES, + global_arguments.dry_run, + ) + except (OSError, CalledProcessError) as error: + encountered_error = error + yield from make_error_log_records( + '{}: Error running pre-backup hook'.format(config_filename), error ) if not encountered_error: diff --git a/borgmatic/config/schema.yaml b/borgmatic/config/schema.yaml index d8c663b2..6212a901 100644 --- a/borgmatic/config/schema.yaml +++ b/borgmatic/config/schema.yaml @@ -34,7 +34,7 @@ map: example: true lock_client: type: bool - desc: Lock config when running borgmatic to prevent multiple instances from running simultaneously + desc: Lock config when running borgmatic to prevent multiple instances from running simultaneously. Defaults to false. example: true numeric_owner: type: bool