diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-27 17:03:42 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-27 17:03:42 +0000 |
| commit | bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6 (patch) | |
| tree | 764b035dc6beebd5ced279f02d10b5b0e0720894 /lib/python/qmk/info.py | |
| parent | a311514f43de7cf7bde758a691419a95367cebe2 (diff) | |
| parent | fce9cb933845bf0b74d322eba02de3b76daaeb84 (diff) | |
| download | qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.tar.gz qmk_firmware-bca7a99e7aad2ff0a4aaed2d0e755e2d6bd7cee6.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/info.py')
| -rw-r--r-- | lib/python/qmk/info.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 7f3aabdc3..1b4c42ff4 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py | |||
| @@ -29,10 +29,10 @@ def info_json(keyboard): | |||
| 29 | """Generate the info.json data for a specific keyboard. | 29 | """Generate the info.json data for a specific keyboard. |
| 30 | """ | 30 | """ |
| 31 | cur_dir = Path('keyboards') | 31 | cur_dir = Path('keyboards') |
| 32 | rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk') | 32 | root_rules_mk = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk') |
| 33 | if 'DEFAULT_FOLDER' in rules: | 33 | |
| 34 | keyboard = rules['DEFAULT_FOLDER'] | 34 | if 'DEFAULT_FOLDER' in root_rules_mk: |
| 35 | rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk', rules) | 35 | keyboard = root_rules_mk['DEFAULT_FOLDER'] |
| 36 | 36 | ||
| 37 | info_data = { | 37 | info_data = { |
| 38 | 'keyboard_name': str(keyboard), | 38 | 'keyboard_name': str(keyboard), |