diff options
| author | Erovia <Erovia@users.noreply.github.com> | 2021-05-30 16:17:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 16:17:40 +0100 |
| commit | 305cca9a5e4c304b0883f07ab4e5de9a493fdbd9 (patch) | |
| tree | d5600580a30829015d172bef5245d81eec68c7ff | |
| parent | 1646c0f26cfa21a7023d404008e4d0aa4917193d (diff) | |
| download | qmk_firmware-305cca9a5e4c304b0883f07ab4e5de9a493fdbd9.tar.gz qmk_firmware-305cca9a5e4c304b0883f07ab4e5de9a493fdbd9.zip | |
CLI: Fix automagic (#13046)
| -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 8d43ae980..f6270990b 100644 --- a/lib/python/qmk/decorators.py +++ b/lib/python/qmk/decorators.py | |||
| @@ -17,12 +17,12 @@ def automagic_keyboard(func): | |||
| 17 | @functools.wraps(func) | 17 | @functools.wraps(func) |
| 18 | def wrapper(*args, **kwargs): | 18 | def wrapper(*args, **kwargs): |
| 19 | # Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards` | 19 | # Ensure that `--keyboard` was not passed and CWD is under `qmk_firmware/keyboards` |
| 20 | if cli.config_source[cli._entrypoint.__name__]['keyboard'] != 'argument': | 20 | if cli.config_source[cli._subcommand.__name__]['keyboard'] != 'argument': |
| 21 | keyboard = find_keyboard_from_dir() | 21 | keyboard = find_keyboard_from_dir() |
| 22 | 22 | ||
| 23 | if keyboard: | 23 | if keyboard: |
| 24 | cli.config[cli._entrypoint.__name__]['keyboard'] = keyboard | 24 | cli.config[cli._subcommand.__name__]['keyboard'] = keyboard |
| 25 | cli.config_source[cli._entrypoint.__name__]['keyboard'] = 'keyboard_directory' | 25 | cli.config_source[cli._subcommand.__name__]['keyboard'] = 'keyboard_directory' |
| 26 | 26 | ||
| 27 | return func(*args, **kwargs) | 27 | return func(*args, **kwargs) |
| 28 | 28 | ||
| @@ -37,12 +37,12 @@ def automagic_keymap(func): | |||
| 37 | @functools.wraps(func) | 37 | @functools.wraps(func) |
| 38 | def wrapper(*args, **kwargs): | 38 | def wrapper(*args, **kwargs): |
| 39 | # Ensure that `--keymap` was not passed and that we're under `qmk_firmware` | 39 | # Ensure that `--keymap` was not passed and that we're under `qmk_firmware` |
| 40 | if cli.config_source[cli._entrypoint.__name__]['keymap'] != 'argument': | 40 | if cli.config_source[cli._subcommand.__name__]['keymap'] != 'argument': |
| 41 | keymap_name, keymap_type = find_keymap_from_dir() | 41 | keymap_name, keymap_type = find_keymap_from_dir() |
| 42 | 42 | ||
| 43 | if keymap_name: | 43 | if keymap_name: |
| 44 | cli.config[cli._entrypoint.__name__]['keymap'] = keymap_name | 44 | cli.config[cli._subcommand.__name__]['keymap'] = keymap_name |
| 45 | cli.config_source[cli._entrypoint.__name__]['keymap'] = keymap_type | 45 | cli.config_source[cli._subcommand.__name__]['keymap'] = keymap_type |
| 46 | 46 | ||
| 47 | return func(*args, **kwargs) | 47 | return func(*args, **kwargs) |
| 48 | 48 | ||