diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-16 16:45:28 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-16 16:45:28 +0000 |
| commit | b0c2dd8d508a2fadae40f0afff38f547fffdebcd (patch) | |
| tree | 33c1149f34d0c024ba3d65b33e0a650dc2930e7e | |
| parent | 776e6b8d379c11ec2ec2f6ea11144ea8f371307a (diff) | |
| parent | 3c0eeec755882f606fa9175677bd4d3d20082c07 (diff) | |
| download | qmk_firmware-b0c2dd8d508a2fadae40f0afff38f547fffdebcd.tar.gz qmk_firmware-b0c2dd8d508a2fadae40f0afff38f547fffdebcd.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | lib/python/qmk/info.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index edbf5d7c82..5eb10e3cef 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -691,8 +691,8 @@ def merge_info_jsons(keyboard, info_data): if layout_name in info_data['layouts']: if len(info_data['layouts'][layout_name]['layout']) != len(layout['layout']): - msg = '%s: %s: Number of elements in info.json does not match! info.json:%s != %s:%s' - _log_error(info_data, msg % (info_data['keyboard_folder'], layout_name, len(layout['layout']), layout_name, len(info_data['layouts'][layout_name]['layout']))) + msg = 'Number of keys for %s does not match! info.json specifies %d keys, C macro specifies %d' + _log_error(info_data, msg % (layout_name, len(layout['layout']), len(info_data['layouts'][layout_name]['layout']))) else: for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): existing_key.update(new_key) |