From 8cd71917ce74dd8301e24d80f4eabb2bfa1a7c69 Mon Sep 17 00:00:00 2001
From: Joel Challis
Date: Wed, 23 Apr 2025 01:27:47 +0100
Subject: Avoid duplication in generated community modules `rules.mk` (#25135)

---
 lib/python/qmk/info.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'lib/python/qmk/info.py')

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
-- 
cgit v1.2.3