diff options
author | QMK Bot <hello@qmk.fm> | 2022-06-15 21:44:32 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-06-15 21:44:32 +0000 |
commit | 589bdedc470975406ddc0b0ce1034ecd44cd3f00 (patch) | |
tree | 1d5a9a05cb5e04eb574f19940fe955f2153d0a54 /lib | |
parent | 6e10a8017447df7624e02a9575d8bda355e2f255 (diff) | |
parent | d3dfa83b4069507df5e8e36def33826a269cd720 (diff) | |
download | qmk_firmware-589bdedc470975406ddc0b0ce1034ecd44cd3f00.tar.gz qmk_firmware-589bdedc470975406ddc0b0ce1034ecd44cd3f00.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/python/qmk/cli/compile.py | 5 | ||||
-rw-r--r-- | lib/python/qmk/cli/flash.py | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index acbd778649..95118e6687 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py @@ -32,8 +32,9 @@ def compile(cli): If a keyboard and keymap are provided this command will build a firmware based on that. """ if cli.args.clean and not cli.args.filename and not cli.args.dry_run: - command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean') - cli.run(command, capture_output=False, stdin=DEVNULL) + if cli.config.compile.keyboard and cli.config.compile.keymap: + command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean') + cli.run(command, capture_output=False, stdin=DEVNULL) # Build the environment vars envs = {} diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py index 3ff4a318df..ebe739c50e 100644 --- a/lib/python/qmk/cli/flash.py +++ b/lib/python/qmk/cli/flash.py @@ -61,8 +61,9 @@ def flash(cli): If bootloader is omitted the make system will use the configured bootloader for that keyboard. """ if cli.args.clean and not cli.args.filename and not cli.args.dry_run: - command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean') - cli.run(command, capture_output=False, stdin=DEVNULL) + if cli.config.flash.keyboard and cli.config.flash.keymap: + command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean') + cli.run(command, capture_output=False, stdin=DEVNULL) # Build the environment vars envs = {} |