|
@@ -143,6 +143,7 @@ def check_archives(
|
|
umask = config.get('umask')
|
|
umask = config.get('umask')
|
|
borg_exit_codes = config.get('borg_exit_codes')
|
|
borg_exit_codes = config.get('borg_exit_codes')
|
|
working_directory = borgmatic.config.paths.get_working_directory(config)
|
|
working_directory = borgmatic.config.paths.get_working_directory(config)
|
|
|
|
+ progress = check_arguments.progress or config.get('progress')
|
|
|
|
|
|
if 'data' in checks:
|
|
if 'data' in checks:
|
|
checks.add('archives')
|
|
checks.add('archives')
|
|
@@ -170,7 +171,7 @@ def check_archives(
|
|
+ (('--log-json',) if global_arguments.log_json else ())
|
|
+ (('--log-json',) if global_arguments.log_json else ())
|
|
+ (('--lock-wait', str(lock_wait)) if lock_wait else ())
|
|
+ (('--lock-wait', str(lock_wait)) if lock_wait else ())
|
|
+ verbosity_flags
|
|
+ verbosity_flags
|
|
- + (('--progress',) if check_arguments.progress else ())
|
|
|
|
|
|
+ + (('--progress',) if progress else ())
|
|
+ (tuple(extra_borg_options.split(' ')) if extra_borg_options else ())
|
|
+ (tuple(extra_borg_options.split(' ')) if extra_borg_options else ())
|
|
+ flags.make_repository_flags(repository_path, local_borg_version)
|
|
+ flags.make_repository_flags(repository_path, local_borg_version)
|
|
)
|
|
)
|
|
@@ -180,7 +181,7 @@ def check_archives(
|
|
# The Borg repair option triggers an interactive prompt, which won't work when output is
|
|
# The Borg repair option triggers an interactive prompt, which won't work when output is
|
|
# captured. And progress messes with the terminal directly.
|
|
# captured. And progress messes with the terminal directly.
|
|
output_file=(
|
|
output_file=(
|
|
- DO_NOT_CAPTURE if check_arguments.repair or check_arguments.progress else None
|
|
|
|
|
|
+ DO_NOT_CAPTURE if check_arguments.repair or progress else None
|
|
),
|
|
),
|
|
environment=environment.make_environment(config),
|
|
environment=environment.make_environment(config),
|
|
working_directory=working_directory,
|
|
working_directory=working_directory,
|