aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/keymap.py
diff options
context:
space:
mode:
authorErovia <Erovia@users.noreply.github.com>2021-05-27 17:42:38 +0100
committerGitHub <noreply@github.com>2021-05-27 17:42:38 +0100
commit84883d340045c50ce6c200c9087461c1db853898 (patch)
tree7cdcc263baa2fc387f0f622c431523a9ee6aa7ec /lib/python/qmk/keymap.py
parent147cf8afbb3f7f9b09623c50e42fd3dec76d2147 (diff)
downloadqmk_firmware-84883d340045c50ce6c200c9087461c1db853898.tar.gz
qmk_firmware-84883d340045c50ce6c200c9087461c1db853898.zip
CLI/c2json: Print 'cpp' error when executed in verbose mode (#12869)
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'lib/python/qmk/keymap.py')
-rw-r--r--lib/python/qmk/keymap.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index ac7951082..2d5921e7a 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -13,6 +13,7 @@ from pygments import lex
13 13
14import qmk.path 14import qmk.path
15from qmk.keyboard import find_keyboard_from_dir, rules_mk 15from qmk.keyboard import find_keyboard_from_dir, rules_mk
16from qmk.errors import CppError
16 17
17# The `keymap.c` template to use when a keyboard doesn't have its own 18# The `keymap.c` template to use when a keyboard doesn't have its own
18DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H 19DEFAULT_KEYMAP_C = """#include QMK_KEYBOARD_H
@@ -372,7 +373,10 @@ def _c_preprocess(path, stdin=DEVNULL):
372 """ 373 """
373 cmd = ['cpp', str(path)] if path else ['cpp'] 374 cmd = ['cpp', str(path)] if path else ['cpp']
374 pre_processed_keymap = cli.run(cmd, stdin=stdin) 375 pre_processed_keymap = cli.run(cmd, stdin=stdin)
375 376 if 'fatal error' in pre_processed_keymap.stderr:
377 for line in pre_processed_keymap.stderr.split('\n'):
378 if 'fatal error' in line:
379 raise (CppError(line))
376 return pre_processed_keymap.stdout 380 return pre_processed_keymap.stdout
377 381
378 382