diff options
| author | Drashna Jael're <drashna@live.com> | 2021-10-20 10:49:14 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2021-10-20 10:49:14 -0700 |
| commit | 8ea22cc06f5591e04f154ad20e4aa558b03f6f41 (patch) | |
| tree | 70362d2529229659a4a0ebc0bf7ce5c00d2c8971 /lib | |
| parent | 51517ee9d4f0150fdd90ed74044c11995df32c50 (diff) | |
| parent | 0fd45d59845d71e435f36975d9ba8a54dfb2a87d (diff) | |
Merge tag '0.14.25' into firmware_21
Diffstat (limited to 'lib')
| -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 1b4c42ff41..350e5e2178 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) |