aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/decorators.py
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2025-05-05 00:23:26 +0000
committerQMK Bot <[email protected]>2025-05-05 00:23:26 +0000
commita992e32bd5fae173cd4b133d71e2b0a8b1e1ed8d (patch)
tree6418ba4d6a97754915118470ae4d3739637537c8 /lib/python/qmk/decorators.py
parent12caf0be4eab171ffeb041cc153f9addb68f404e (diff)
parentcf5ce64b1b2bc4d5362c94473a2b9f25a64e4892 (diff)
downloadqmk_firmware-a992e32bd5fae173cd4b133d71e2b0a8b1e1ed8d.tar.gz
qmk_firmware-a992e32bd5fae173cd4b133d71e2b0a8b1e1ed8d.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/decorators.py')
-rw-r--r--lib/python/qmk/decorators.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/python/qmk/decorators.py b/lib/python/qmk/decorators.py
index 16b44d6d59..0cad55a483 100644
--- a/lib/python/qmk/decorators.py
+++ b/lib/python/qmk/decorators.py
@@ -5,7 +5,7 @@ from time import monotonic
from milc import cli
-from qmk.keyboard import find_keyboard_from_dir
+from qmk.keyboard import find_keyboard_from_dir, keyboard_folder
from qmk.keymap import find_keymap_from_dir
@@ -27,6 +27,11 @@ def automagic_keyboard(func):
def wrapper(*args, **kwargs):
cmd = _get_subcommand_name()
+ # TODO: Workaround for if config file contains "old" keyboard name
+ # Potential long-term fix needs to be within global cli or milc
+ if cli.config_source[cmd]['keyboard'] == 'config_file':
+ cli.config[cmd]['keyboard'] = keyboard_folder(cli.config[cmd]['keyboard'])
+
# Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards`
if cli.config_source[cmd]['keyboard'] != 'argument':
keyboard = find_keyboard_from_dir()