浏览代码

make json imports more robust (#13928)

Zach White 3 年之前
父节点
当前提交
5eb0e406fd
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      lib/python/qmk/json_schema.py

+ 4 - 1
lib/python/qmk/json_schema.py

@@ -17,9 +17,12 @@ def json_load(json_file):
     try:
     try:
         return hjson.load(json_file.open(encoding='utf-8'))
         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)
         cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
         exit(1)
         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):
 def load_jsonschema(schema_name):