diff options
| author | Ryan <fauxpark@gmail.com> | 2021-10-17 03:44:56 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 17:44:56 +0100 |
| commit | 3c0eeec755882f606fa9175677bd4d3d20082c07 (patch) | |
| tree | 2090445f38103fd859acaff6f145e7f938b1b325 /lib/python | |
| parent | 9200baf593f7394d3ee74b42e15ba9fdcd06932f (diff) | |
| download | qmk_firmware-3c0eeec755882f606fa9175677bd4d3d20082c07.tar.gz qmk_firmware-3c0eeec755882f606fa9175677bd4d3d20082c07.zip | |
Try to clarify "number of elements in info.json does not match" error (#14844)
Diffstat (limited to 'lib/python')
| -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 1b4c42ff4..350e5e217 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py | |||
| @@ -691,8 +691,8 @@ def merge_info_jsons(keyboard, info_data): | |||
| 691 | 691 | ||
| 692 | if layout_name in info_data['layouts']: | 692 | if layout_name in info_data['layouts']: |
| 693 | if len(info_data['layouts'][layout_name]['layout']) != len(layout['layout']): | 693 | if len(info_data['layouts'][layout_name]['layout']) != len(layout['layout']): |
| 694 | msg = '%s: %s: Number of elements in info.json does not match! info.json:%s != %s:%s' | 694 | msg = 'Number of keys for %s does not match! info.json specifies %d keys, C macro specifies %d' |
| 695 | _log_error(info_data, msg % (info_data['keyboard_folder'], layout_name, len(layout['layout']), layout_name, len(info_data['layouts'][layout_name]['layout']))) | 695 | _log_error(info_data, msg % (layout_name, len(layout['layout']), len(info_data['layouts'][layout_name]['layout']))) |
| 696 | else: | 696 | else: |
| 697 | for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): | 697 | for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']): |
| 698 | existing_key.update(new_key) | 698 | existing_key.update(new_key) |