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