From 596f6f9dac10ffa8132324baaed3871ead7d07e7 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Thu, 27 Sep 2018 08:12:54 -0700 Subject: [PATCH] Update help/README about --create --json. --- NEWS | 3 +++ README.md | 4 ++-- borgmatic/commands/borgmatic.py | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index c78cae2..0aabf6d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +1.2.4 + * Fix for archive checking traceback due to parameter mismatch. + 1.2.3 * #64, #90, #92: Rewrite of logging system. Now verbosity flags passed to Borg are derived from borgmatic's log level. Note that the output of borgmatic might slightly change. diff --git a/README.md b/README.md index 6ceb9cd..849460d 100644 --- a/README.md +++ b/README.md @@ -306,8 +306,8 @@ borgmatic --list borgmatic --info ``` -You can include an optional `--json` flag with either `--list` or `--info` to -get the output formatted as JSON. +You can include an optional `--json` flag with `--create`, `--list`, or +`--info` to get the output formatted as JSON. ## Autopilot diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 9b44047..5ed6cb1 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -81,7 +81,7 @@ def parse_arguments(*arguments): dest='json', default=False, action='store_true', - help='Output results from the --list or --info options as json', + help='Output results from the --create, --list, or --info options as json', ) parser.add_argument( '-n', '--dry-run', @@ -100,7 +100,7 @@ def parse_arguments(*arguments): args = parser.parse_args(arguments) if args.json and not (args.create or args.list or args.info): - raise ValueError('The --json option can only be used with the --create, --list or --info options') + raise ValueError('The --json option can only be used with the --create, --list, or --info options') if args.json and args.list and args.info: raise ValueError(