drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[CLI] Don't exit() when certain exceptions occur. (#23442)

Browse source
This commit is contained in:
Nick Brassel 2024-06-15 19:37:47 +10:00 • committed by GitHub
parent d4654ab893
commit 0262161914
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/python/qmk/json_schema.py
View file

@ -11,6 +11,8 @@ from copy import deepcopy
from milc import cli
from qmk.util import maybe_exit
def _dict_raise_on_duplicates(ordered_pairs):
"""Reject duplicate keys."""
@ -38,10 +40,10 @@ def _json_load_impl(json_file, strict=True):
except (json.decoder.JSONDecodeError, hjson.HjsonDecodeError) as e:
cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
exit(1)
maybe_exit(1)
except Exception as e:
cli.log.error('Unknown error attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
exit(1)
maybe_exit(1)
def json_load(json_file, strict=True):