summaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/flash.py
diff options
context:
space:
mode:
authorZach White <skullydazed@gmail.com>2021-05-19 15:49:11 -0700
committerZach White <skullydazed@gmail.com>2021-05-19 15:49:11 -0700
commit6955c5a00295382d3b4151a840aa5c929cd98059 (patch)
tree26109c4ed2a266650fc5fad19ce5f784bc7c346b /lib/python/qmk/cli/flash.py
parent82aa9ad4a567695d1f7d0b1e36bf8563d2967813 (diff)
parentdb1eacdaacb9c8f6889f46bc1c6af155b81ad72a (diff)
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts: lib/python/qmk/tests/test_cli_commands.py util/install/fedora.sh
Diffstat (limited to 'lib/python/qmk/cli/flash.py')
-rw-r--r--lib/python/qmk/cli/flash.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py
index 1b67840616..1b2932a5b2 100644
--- a/lib/python/qmk/cli/flash.py
+++ b/lib/python/qmk/cli/flash.py
@@ -3,6 +3,7 @@
You can compile a keymap already in the repo or using a QMK Configurator export.
A bootloader must be specified.
"""
+from subprocess import DEVNULL
from argcomplete.completers import FilesCompleter
from milc import cli
@@ -55,7 +56,7 @@ def flash(cli):
"""
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)
+ cli.run(command, capture_output=False, stdin=DEVNULL)
# Build the environment vars
envs = {}
@@ -98,7 +99,7 @@ def flash(cli):
cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
if not cli.args.dry_run:
cli.echo('\n')
- compile = cli.run(command, capture_output=False, text=True)
+ compile = cli.run(command, capture_output=False, stdin=DEVNULL)
return compile.returncode
else: