summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-08-09 08:27:02 -0700
committerGitHub <noreply@github.com>2021-08-09 08:27:02 -0700
commit5eb0e406fdc6e0612db18ea5bde93f98c215808d (patch)
treec66c1d9ce06b0af49557549a8f40b9afffdd0665 /lib
parent79d5b279931cf98d635181235c0301ba7053f9d5 (diff)
make json imports more robust (#13928)
Diffstat (limited to 'lib')
-rw-r--r--lib/python/qmk/json_schema.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index 077dfcaa93..f3992ee71a 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -17,9 +17,12 @@ def json_load(json_file):
try:
return hjson.load(json_file.open(encoding='utf-8'))
- except json.decoder.JSONDecodeError as e:
+ 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)
+ 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)
def load_jsonschema(schema_name):