diff options
author | QMK Bot <[email protected]> | 2025-01-29 19:18:02 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2025-01-29 19:18:02 +0000 |
commit | cfcb8488eda38976d731c8d0ae64a57415f42443 (patch) | |
tree | 2b0fa191a7af49b8f0d2b7b36043ed82e0aea15c /lib | |
parent | 9d799aff97163a1cce24c2bd1551a085fac7a8f6 (diff) | |
parent | 76b5cef79345cdb42bbcb42417f56881c4e59b2d (diff) | |
download | qmk_firmware-cfcb8488eda38976d731c8d0ae64a57415f42443.tar.gz qmk_firmware-cfcb8488eda38976d731c8d0ae64a57415f42443.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib')
-rw-r--r-- | lib/python/qmk/info.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 38ca89697c..d70e7ee1b3 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -99,6 +99,13 @@ def _validate_build_target(keyboard, info_data): if info_file != keyboard_json_path: _log_error(info_data, f'Invalid keyboard.json location detected: {info_file}.') + # No keyboard.json next to info.json + for conf_file in config_files: + if conf_file.name == 'keyboard.json': + info_file = conf_file.parent / 'info.json' + if info_file.exists(): + _log_error(info_data, f'Invalid info.json location detected: {info_file}.') + # Moving forward keyboard.json should be used as a build target if keyboard_json_count == 0: _log_warning(info_data, 'Build marker "keyboard.json" not found.') |