diff options
author | Joel Challis <[email protected]> | 2023-01-19 00:24:13 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2023-01-19 00:24:13 +0000 |
commit | a1f253cbef309906c989cfb3e123ee8fb3172bb4 (patch) | |
tree | 5e9094d4aeea4b4134f5e8f770da2f887e82eb0e /lib/python/qmk/cli/flash.py | |
parent | baecc69da5c6fc9961392f77e5a7d8d2e095b69a (diff) | |
download | qmk_firmware-a1f253cbef309906c989cfb3e123ee8fb3172bb4.tar.gz qmk_firmware-a1f253cbef309906c989cfb3e123ee8fb3172bb4.zip |
`qmk compile`/`qmk flash` - Validate keymap argument (#19530)
Diffstat (limited to 'lib/python/qmk/cli/flash.py')
-rw-r--r-- | lib/python/qmk/cli/flash.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py index 52defb5f0d..8724f26889 100644 --- a/lib/python/qmk/cli/flash.py +++ b/lib/python/qmk/cli/flash.py @@ -11,10 +11,20 @@ import qmk.path from qmk.decorators import automagic_keyboard, automagic_keymap from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json, build_environment from qmk.keyboard import keyboard_completer, keyboard_folder -from qmk.keymap import keymap_completer +from qmk.keymap import keymap_completer, locate_keymap from qmk.flashers import flasher +def _is_keymap_target(keyboard, keymap): + if keymap == 'all': + return True + + if locate_keymap(keyboard, keymap): + return True + + return False + + def _list_bootloaders(): """Prints the available bootloaders listed in docs.qmk.fm. """ @@ -98,6 +108,11 @@ def flash(cli): elif cli.config.flash.keyboard and cli.config.flash.keymap: # Generate the make command for a specific keyboard/keymap. + if not _is_keymap_target(cli.config.flash.keyboard, cli.config.flash.keymap): + cli.log.error('Invalid keymap argument.') + cli.print_help() + return False + if cli.args.clean: commands.append(create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean', **envs)) commands.append(create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, cli.args.bootloader, parallel=cli.config.flash.parallel, **envs)) |