Renamed `--force-new` to `--force-dict-output`

pull/4547/head
Daniel Mensinger 6 years ago
parent 5c39dd0668
commit 84948ea6cd
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
  1. 2
      docs/markdown/snippets/introspect_multiple.md
  2. 6
      mesonbuild/mintro.py

@ -7,7 +7,7 @@ object.
The format for a single command was not changed to keep backward
compatibility.
Furthermore the option `-a,--all`, `-i,--indent` and `-f,--force-new`
Furthermore the option `-a,--all`, `-i,--indent` and `-f,--force-dict-output`
were added to print all introspection information in one go, format the
JSON output (the default is still compact JSON) and foce use the new
output format, even if only one introspection command was given.

@ -62,7 +62,7 @@ def add_arguments(parser):
help='Print all available information.')
parser.add_argument('-i', '--indent', dest='indent', type=int, default=0,
help='Number of spaces used for indentation.')
parser.add_argument('-f', '--force-new', action='store_true', dest='force_new', default=False,
parser.add_argument('-f', '--force-dict-output', action='store_true', dest='force_dict', default=False,
help='Always use the new JSON format for multiple entries (even for 0 and 1 introspection commands)')
parser.add_argument('builddir', nargs='?', default='.', help='The build directory')
@ -504,10 +504,10 @@ def run(options):
indent = options.indent if options.indent > 0 else None
if len(results) == 0 and not options.force_new:
if len(results) == 0 and not options.force_dict:
print('No command specified')
return 1
elif len(results) == 1 and not options.force_new:
elif len(results) == 1 and not options.force_dict:
# Make to keep the existing output format for a single option
print(json.dumps(results[0][1], indent=indent))
else:

Loading…
Cancel
Save