summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-02 17:28:05 +0000
committerQMK Bot <hello@qmk.fm>2021-01-02 17:28:05 +0000
commitf12000a1b60dea2db20ed496294ef83765fd372f (patch)
tree5d160a819b588a3a9e5a5ba1f9ce15973271fd80
parent266343666fafaddff89e6a6e19410b919df3053c (diff)
parentc07543133a092039c7eae0cead6c9ee3badcc7dc (diff)
Merge remote-tracking branch 'origin/master' into develop
-rwxr-xr-xlib/python/qmk/cli/compile.py3
-rw-r--r--lib/python/qmk/cli/flash.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py
index 341f365f8c..daee597d8e 100755
--- a/lib/python/qmk/cli/compile.py
+++ b/lib/python/qmk/cli/compile.py
@@ -48,7 +48,8 @@ def compile(cli):
cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
if not cli.args.dry_run:
cli.echo('\n')
- subprocess.run(command)
+ compile = subprocess.run(command)
+ return compile.returncode
else:
cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')
diff --git a/lib/python/qmk/cli/flash.py b/lib/python/qmk/cli/flash.py
index cefb9ca31a..d720d42e71 100644
--- a/lib/python/qmk/cli/flash.py
+++ b/lib/python/qmk/cli/flash.py
@@ -81,7 +81,8 @@ def flash(cli):
cli.log.info('Compiling keymap with {fg_cyan}%s', ' '.join(command))
if not cli.args.dry_run:
cli.echo('\n')
- subprocess.run(command)
+ compile = subprocess.run(command)
+ return compile.returncode
else:
cli.log.error('You must supply a configurator export, both `--keyboard` and `--keymap`, or be in a directory for a keyboard or keymap.')