From 7516443a8968a9dc4953596a96042b816e4eece5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Dec 2018 12:37:24 +0100 Subject: [PATCH] fix changes requested about stats --- borgmatic/borg/create.py | 3 +-- borgmatic/commands/borgmatic.py | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/borgmatic/borg/create.py b/borgmatic/borg/create.py index 818ccac4..70151e24 100644 --- a/borgmatic/borg/create.py +++ b/borgmatic/borg/create.py @@ -136,11 +136,10 @@ def create_archive( + (('--lock-wait', str(lock_wait)) if lock_wait else ()) + (('--list', '--filter', 'AME-') if logger.isEnabledFor(logging.INFO) else ()) + (('--info',) if logger.getEffectiveLevel() == logging.INFO else ()) - + (('--stats',) if not dry_run and logger.isEnabledFor(logging.INFO) else ()) + + (('--stats',) if not dry_run and (logger.isEnabledFor(logging.INFO) or stats) else ()) + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ()) + (('--dry-run',) if dry_run else ()) + (('--progress',) if progress else ()) - + (('--stats',) if stats else ()) + (('--json',) if json else ()) ) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 09b66ae5..e4aab495 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -112,7 +112,7 @@ def parse_arguments(*arguments): dest='stats', default=False, action='store_true', - help='Display status with --create or --prune option for each file as it is backed up', + help='Display statistics of archive with --create or --prune option', ) parser.add_argument( '--json', @@ -160,7 +160,9 @@ def parse_arguments(*arguments): raise ValueError('The --progress option can only be used with the --create option') if args.stats and not (args.create or args.prune): - raise ValueError('The --stats option can only be used with the --create, or --prune options') + raise ValueError( + 'The --stats option can only be used with the --create, or --prune options' + ) if args.json and not (args.create or args.list or args.info): raise ValueError(