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

Update help/README about --create --json.

Browse source
This commit is contained in:
Dan Helfman 2018-09-27 08:12:54 -07:00
parent 7ecdaea83a
commit 596f6f9dac
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -1,3 +1,6 @@
1.2.4
* Fix for archive checking traceback due to parameter mismatch.
1.2.3 1.2.3
* #64, #90, #92: Rewrite of logging system. Now verbosity flags passed to Borg are derived from * #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. borgmatic's log level. Note that the output of borgmatic might slightly change.

4
README.md
View file

@ -306,8 +306,8 @@ borgmatic --list
borgmatic --info borgmatic --info
``` ```
You can include an optional `--json` flag with either `--list` or `--info` to You can include an optional `--json` flag with `--create`, `--list`, or
get the output formatted as JSON. `--info` to get the output formatted as JSON.
## Autopilot ## Autopilot

4
borgmatic/commands/borgmatic.py
View file

@ -81,7 +81,7 @@ def parse_arguments(*arguments):
dest='json', dest='json',
default=False, default=False,
action='store_true', 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( parser.add_argument(
'-n', '--dry-run', '-n', '--dry-run',
@ -100,7 +100,7 @@ def parse_arguments(*arguments):
args = parser.parse_args(arguments) args = parser.parse_args(arguments)
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('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: if args.json and args.list and args.info:
raise ValueError( raise ValueError(