changes as per comments in PR #283
This commit is contained in:
parent
5f0c084bee
commit
75b5e7254e
4 changed files with 9 additions and 24 deletions
|
@ -178,16 +178,13 @@ def create_archive(
|
||||||
+ (('--lock-wait', str(lock_wait)) if lock_wait else ())
|
+ (('--lock-wait', str(lock_wait)) if lock_wait else ())
|
||||||
+ (
|
+ (
|
||||||
('--list', '--filter', 'AME-')
|
('--list', '--filter', 'AME-')
|
||||||
if logger.isEnabledFor(logging.INFO)
|
if (files or logger.isEnabledFor(logging.DEBUG)) and not json and not progress
|
||||||
and not json
|
|
||||||
and not progress
|
|
||||||
and (files or logger.isEnabledFor(logging.DEBUG))
|
|
||||||
else ()
|
else ()
|
||||||
)
|
)
|
||||||
+ (('--info',) if logger.getEffectiveLevel() == logging.INFO and not json else ())
|
+ (('--info',) if logger.getEffectiveLevel() == logging.INFO and not json else ())
|
||||||
+ (
|
+ (
|
||||||
('--stats',)
|
('--stats',)
|
||||||
if not dry_run and (logger.isEnabledFor(logging.DEBUG) or stats) and not json
|
if (stats or logger.isEnabledFor(logging.DEBUG)) and not json and not dry_run
|
||||||
else ()
|
else ()
|
||||||
)
|
)
|
||||||
+ (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) and not json else ())
|
+ (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) and not json else ())
|
||||||
|
@ -211,8 +208,6 @@ def create_archive(
|
||||||
|
|
||||||
if json:
|
if json:
|
||||||
output_log_level = None
|
output_log_level = None
|
||||||
elif stats and logger.getEffectiveLevel() == logging.WARNING:
|
|
||||||
output_log_level = logging.WARNING
|
|
||||||
else:
|
else:
|
||||||
output_log_level = logging.INFO
|
output_log_level = logging.INFO
|
||||||
|
|
||||||
|
|
|
@ -58,23 +58,13 @@ def prune_archives(
|
||||||
+ (('--remote-path', remote_path) if remote_path else ())
|
+ (('--remote-path', remote_path) if remote_path else ())
|
||||||
+ (('--umask', str(umask)) if umask else ())
|
+ (('--umask', str(umask)) if umask else ())
|
||||||
+ (('--lock-wait', str(lock_wait)) if lock_wait else ())
|
+ (('--lock-wait', str(lock_wait)) if lock_wait else ())
|
||||||
+ (
|
+ (('--stats',) if (stats or logger.isEnabledFor(logging.DEBUG)) and not dry_run else ())
|
||||||
('--stats',)
|
|
||||||
if not dry_run and logger.getEffectiveLevel() == logging.DEBUG or stats
|
|
||||||
else ()
|
|
||||||
)
|
|
||||||
+ (('--info',) if logger.getEffectiveLevel() == logging.INFO else ())
|
+ (('--info',) if logger.getEffectiveLevel() == logging.INFO else ())
|
||||||
+ (('--list',) if logger.getEffectiveLevel() == logging.INFO and files else ())
|
+ (('--list',) if files or logger.isEnabledFor(logging.DEBUG) else ())
|
||||||
+ (('--debug', '--list', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
|
+ (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
|
||||||
+ (('--dry-run',) if dry_run else ())
|
+ (('--dry-run',) if dry_run else ())
|
||||||
+ (tuple(extra_borg_options.split(' ')) if extra_borg_options else ())
|
+ (tuple(extra_borg_options.split(' ')) if extra_borg_options else ())
|
||||||
+ (repository,)
|
+ (repository,)
|
||||||
)
|
)
|
||||||
|
|
||||||
execute_command(
|
execute_command(full_command, output_log_level=logging.INFO, error_on_warnings=False)
|
||||||
full_command,
|
|
||||||
output_log_level=logging.WARNING
|
|
||||||
if (stats and logger.getEffectiveLevel() == logging.WARNING)
|
|
||||||
else logging.INFO,
|
|
||||||
error_on_warnings=False,
|
|
||||||
)
|
|
||||||
|
|
|
@ -849,7 +849,7 @@ def test_create_archive_with_stats_calls_borg_with_stats_parameter():
|
||||||
flexmock(module).should_receive('_make_exclude_flags').and_return(())
|
flexmock(module).should_receive('_make_exclude_flags').and_return(())
|
||||||
flexmock(module).should_receive('execute_command').with_args(
|
flexmock(module).should_receive('execute_command').with_args(
|
||||||
('borg', 'create', '--stats') + ARCHIVE_WITH_PATHS,
|
('borg', 'create', '--stats') + ARCHIVE_WITH_PATHS,
|
||||||
output_log_level=logging.WARNING,
|
output_log_level=logging.INFO,
|
||||||
error_on_warnings=False,
|
error_on_warnings=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,7 @@ def test_prune_archives_with_log_debug_calls_borg_with_debug_parameter():
|
||||||
BASE_PRUNE_FLAGS
|
BASE_PRUNE_FLAGS
|
||||||
)
|
)
|
||||||
insert_execute_command_mock(
|
insert_execute_command_mock(
|
||||||
PRUNE_COMMAND + ('--stats', '--debug', '--list', '--show-rc', 'repo'), logging.INFO
|
PRUNE_COMMAND + ('--stats', '--list', '--debug', '--show-rc', 'repo'), logging.INFO
|
||||||
)
|
)
|
||||||
insert_logging_mock(logging.DEBUG)
|
insert_logging_mock(logging.DEBUG)
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ def test_prune_archives_with_stats_calls_borg_with_stats_parameter():
|
||||||
flexmock(module).should_receive('_make_prune_flags').with_args(retention_config).and_return(
|
flexmock(module).should_receive('_make_prune_flags').with_args(retention_config).and_return(
|
||||||
BASE_PRUNE_FLAGS
|
BASE_PRUNE_FLAGS
|
||||||
)
|
)
|
||||||
insert_execute_command_mock(PRUNE_COMMAND + ('--stats', 'repo'), logging.WARNING)
|
insert_execute_command_mock(PRUNE_COMMAND + ('--stats', 'repo'), logging.INFO)
|
||||||
|
|
||||||
module.prune_archives(
|
module.prune_archives(
|
||||||
dry_run=False,
|
dry_run=False,
|
||||||
|
|
Loading…
Reference in a new issue