aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/info.py
diff options
context:
space:
mode:
authorJoel Challis <[email protected]>2025-04-23 01:27:47 +0100
committerGitHub <[email protected]>2025-04-23 10:27:47 +1000
commit8cd71917ce74dd8301e24d80f4eabb2bfa1a7c69 (patch)
tree8b12d8679d1ce7633339a387e0b627eb8df2a3e5 /lib/python/qmk/info.py
parent7a2cd0fa962eb5e6e18ce8b0213a7171bc823c1f (diff)
downloadqmk_firmware-8cd71917ce74dd8301e24d80f4eabb2bfa1a7c69.tar.gz
qmk_firmware-8cd71917ce74dd8301e24d80f4eabb2bfa1a7c69.zip
Avoid duplication in generated community modules `rules.mk` (#25135)
Diffstat (limited to 'lib/python/qmk/info.py')
-rw-r--r--lib/python/qmk/info.py16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 93eba7376a..d95fd3d799 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -1066,23 +1066,13 @@ def get_modules(keyboard, keymap_filename):
"""
modules = []
+ kb_info_json = info_json(keyboard)
+ modules.extend(kb_info_json.get('modules', []))
+
if keymap_filename:
keymap_json = parse_configurator_json(keymap_filename)
if keymap_json:
- kb = keymap_json.get('keyboard', None)
- if not kb:
- kb = keyboard
-
- if kb:
- kb_info_json = info_json(kb)
- if kb_info_json:
- modules.extend(kb_info_json.get('modules', []))
-
modules.extend(keymap_json.get('modules', []))
- elif keyboard:
- kb_info_json = info_json(keyboard)
- modules.extend(kb_info_json.get('modules', []))
-
return list(dict.fromkeys(modules)) # remove dupes