diff options
author | QMK Bot <hello@qmk.fm> | 2021-05-30 15:18:09 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-05-30 15:18:09 +0000 |
commit | 0d74ed3c35afef7e4d2b13a47e9e310183eb85d2 (patch) | |
tree | d5600580a30829015d172bef5245d81eec68c7ff | |
parent | a72172a8fd24ea8ba10d34e0040d23890ed4fe97 (diff) | |
parent | 305cca9a5e4c304b0883f07ab4e5de9a493fdbd9 (diff) |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | lib/python/qmk/decorators.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/qmk/decorators.py b/lib/python/qmk/decorators.py index 8d43ae980f..f6270990b9 100644 --- a/lib/python/qmk/decorators.py +++ b/lib/python/qmk/decorators.py @@ -17,12 +17,12 @@ def automagic_keyboard(func): @functools.wraps(func) def wrapper(*args, **kwargs): # Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards` - if cli.config_source[cli._entrypoint.__name__]['keyboard'] != 'argument': + if cli.config_source[cli._subcommand.__name__]['keyboard'] != 'argument': keyboard = find_keyboard_from_dir() if keyboard: - cli.config[cli._entrypoint.__name__]['keyboard'] = keyboard - cli.config_source[cli._entrypoint.__name__]['keyboard'] = 'keyboard_directory' + cli.config[cli._subcommand.__name__]['keyboard'] = keyboard + cli.config_source[cli._subcommand.__name__]['keyboard'] = 'keyboard_directory' return func(*args, **kwargs) @@ -37,12 +37,12 @@ def automagic_keymap(func): @functools.wraps(func) def wrapper(*args, **kwargs): # Ensure that `--keymap` was not passed and that we're under `qmk_firmware` - if cli.config_source[cli._entrypoint.__name__]['keymap'] != 'argument': + if cli.config_source[cli._subcommand.__name__]['keymap'] != 'argument': keymap_name, keymap_type = find_keymap_from_dir() if keymap_name: - cli.config[cli._entrypoint.__name__]['keymap'] = keymap_name - cli.config_source[cli._entrypoint.__name__]['keymap'] = keymap_type + cli.config[cli._subcommand.__name__]['keymap'] = keymap_name + cli.config_source[cli._subcommand.__name__]['keymap'] = keymap_type return func(*args, **kwargs) |