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

fix changes requested about stats

Browse source
This commit is contained in:
Felix Buehler 2018-12-10 12:37:24 +01:00
parent 73d67e29b4
commit 7516443a89
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
borgmatic/borg/create.py
View file

@ -136,11 +136,10 @@ def create_archive(
+ (('--lock-wait', str(lock_wait)) if lock_wait else ()) + (('--lock-wait', str(lock_wait)) if lock_wait else ())
+ (('--list', '--filter', 'AME-') if logger.isEnabledFor(logging.INFO) else ()) + (('--list', '--filter', 'AME-') if logger.isEnabledFor(logging.INFO) else ())
+ (('--info',) if logger.getEffectiveLevel() == 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 ()) + (('--debug', '--show-rc') if logger.isEnabledFor(logging.DEBUG) else ())
+ (('--dry-run',) if dry_run else ()) + (('--dry-run',) if dry_run else ())
+ (('--progress',) if progress else ()) + (('--progress',) if progress else ())
+ (('--stats',) if stats else ())
+ (('--json',) if json else ()) + (('--json',) if json else ())
) )

6
borgmatic/commands/borgmatic.py
View file

@ -112,7 +112,7 @@ def parse_arguments(*arguments):
dest='stats', dest='stats',
default=False, default=False,
action='store_true', 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( parser.add_argument(
'--json', '--json',
@ -160,7 +160,9 @@ def parse_arguments(*arguments):
raise ValueError('The --progress option can only be used with the --create option') raise ValueError('The --progress option can only be used with the --create option')
if args.stats and not (args.create or args.prune): 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): if args.json and not (args.create or args.list or args.info):
raise ValueError( raise ValueError(