When pruning with verbosity level 1, list pruned and kept archives.
This commit is contained in:
parent
ed2ca9f476
commit
d64bcd5e83
3 changed files with 6 additions and 2 deletions
2
NEWS
2
NEWS
|
@ -2,6 +2,8 @@
|
||||||
* #268: Override particular configuration options from the command-line via "--override" flag. See
|
* #268: Override particular configuration options from the command-line via "--override" flag. See
|
||||||
the documentation for more information:
|
the documentation for more information:
|
||||||
https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#configuration-overrides
|
https://torsion.org/borgmatic/docs/how-to/make-per-application-backups/#configuration-overrides
|
||||||
|
* When pruning with verbosity level 1, list pruned and kept archives. Previously, this information
|
||||||
|
was only shown at verbosity level 2.
|
||||||
|
|
||||||
1.4.20
|
1.4.20
|
||||||
* Fix repository probing during "borgmatic init" to respect verbosity flag and remote_path option.
|
* Fix repository probing during "borgmatic init" to respect verbosity flag and remote_path option.
|
||||||
|
|
|
@ -58,7 +58,7 @@ def prune_archives(
|
||||||
+ (('--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 not dry_run and logger.isEnabledFor(logging.INFO) else ())
|
+ (('--stats',) if not dry_run and logger.isEnabledFor(logging.INFO) else ())
|
||||||
+ (('--info',) if logger.getEffectiveLevel() == logging.INFO else ())
|
+ (('--info', '--list') if logger.getEffectiveLevel() == logging.INFO else ())
|
||||||
+ (('--debug', '--list', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
|
+ (('--debug', '--list', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
|
||||||
+ (('--dry-run',) if dry_run else ())
|
+ (('--dry-run',) if dry_run else ())
|
||||||
+ (('--stats',) if stats else ())
|
+ (('--stats',) if stats else ())
|
||||||
|
|
|
@ -75,7 +75,9 @@ def test_prune_archives_with_log_info_calls_borg_with_info_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', '--info', 'repo'), logging.INFO)
|
insert_execute_command_mock(
|
||||||
|
PRUNE_COMMAND + ('--stats', '--info', '--list', 'repo'), logging.INFO
|
||||||
|
)
|
||||||
insert_logging_mock(logging.INFO)
|
insert_logging_mock(logging.INFO)
|
||||||
|
|
||||||
module.prune_archives(
|
module.prune_archives(
|
||||||
|
|
Loading…
Reference in a new issue