drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

CLI: update subcommands to use return instead of exit() (#10323)

Browse source
This commit is contained in:
Ryan 2020-10-07 10:46:10 +11:00 • committed by GitHub
parent 2013f63134
commit 2c9ffd4739
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/python/qmk/cli/info.py
View file

@ -134,11 +134,11 @@ def info(cli):
if not cli.config.info.keyboard:
cli.log.error('Missing paramater: --keyboard')
cli.subcommands['info'].print_help()
exit(1)
return False
if not is_keyboard(cli.config.info.keyboard):
cli.log.error('Invalid keyboard: "%s"', cli.config.info.keyboard)
exit(1)
return False
# Build the info.json file
kb_info_json = info_json(cli.config.info.keyboard)
@ -146,13 +146,10 @@ def info(cli):
# Output in the requested format
if cli.args.format == 'json':
print(json.dumps(kb_info_json))
exit()
if cli.args.format == 'text':
elif cli.args.format == 'text':
print_text_output(kb_info_json)
elif cli.args.format == 'friendly':
print_friendly_output(kb_info_json)
else:
cli.log.error('Unknown format: %s', cli.args.format)
return False