浏览代码

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

Dan Helfman 6 年之前
父节点
当前提交
596f6f9dac
共有 3 个文件被更改,包括 7 次插入4 次删除
  1. 3 0
      NEWS
  2. 2 2
      README.md
  3. 2 2
      borgmatic/commands/borgmatic.py

+ 3 - 0
NEWS

@@ -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.

+ 2 - 2
README.md

@@ -306,8 +306,8 @@ borgmatic --list
 borgmatic --info
 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
 ## Autopilot

+ 2 - 2
borgmatic/commands/borgmatic.py

@@ -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(