psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When pruning, make highest verbosity level list archives kept and pruned.

Browse source
This commit is contained in:
Dan Helfman 2017-08-26 16:07:30 -07:00
parent 3664ac7418
commit 37ae34a432
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -1,3 +1,7 @@
1.1.7.dev0
* When pruning, make highest verbosity level list archives kept and pruned.
1.1.6 1.1.6
* #12, #35: Support for Borg --exclude-from, --exclude-caches, and --exclude-if-present options. * #12, #35: Support for Borg --exclude-from, --exclude-caches, and --exclude-if-present options.

2
borgmatic/borg/prune.py
View file

@ -33,7 +33,7 @@ def prune_archives(verbosity, repository, retention_config, remote_path=None):
remote_path_flags = ('--remote-path', remote_path) if remote_path else () remote_path_flags = ('--remote-path', remote_path) if remote_path else ()
verbosity_flags = { verbosity_flags = {
VERBOSITY_SOME: ('--info', '--stats',), VERBOSITY_SOME: ('--info', '--stats',),
VERBOSITY_LOTS: ('--debug', '--stats'), VERBOSITY_LOTS: ('--debug', '--stats', '--list'),
}.get(verbosity, ()) }.get(verbosity, ())
full_command = ( full_command = (

2
borgmatic/tests/unit/borg/test_prune.py
View file

@ -70,7 +70,7 @@ def test_prune_archives_with_verbosity_lots_should_call_borg_with_debug_paramete
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_subprocess_mock(PRUNE_COMMAND + ('--debug', '--stats',)) insert_subprocess_mock(PRUNE_COMMAND + ('--debug', '--stats', '--list'))
module.prune_archives( module.prune_archives(
repository='repo', repository='repo',

2
setup.py
View file

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
VERSION = '1.1.6' VERSION = '1.1.7.dev0'
setup( setup(