YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

JSON printing argument

Browse source
This commit is contained in:
Kload 2013-03-13 13:21:23 +01:00
parent 0b85eccce9
commit 3114ea9aaf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
parse_args
View file

@ -175,6 +175,9 @@ def main():
admin_password = sys.argv[key+1] admin_password = sys.argv[key+1]
sys.argv.pop(key) sys.argv.pop(key)
sys.argv.pop(key) sys.argv.pop(key)
if arg == '--json':
json_print = True
sys.argv.pop(key)
try: try:
args = parse_dict(action_map) args = parse_dict(action_map)
@ -201,7 +204,7 @@ def main():
else: else:
if result is None: if result is None:
pass pass
elif os.isatty(1): elif os.isatty(1) and not json_print:
pretty_print_dict(result) pretty_print_dict(result)
else: else:
print(json.dumps(result)) print(json.dumps(result))