commit 485d948ce86f5a096dc848ec31b70cd66452d40d
author Marc-André Lureau <marcandre.lureau@redhat.com> Tue Jul 03 17:56:39 2018 +0200
committer Markus Armbruster <armbru@redhat.com> Tue Jul 03 18:38:53 2018 +0200
tree 7c4e34979e09495e39992046b2505e8286a51794
parent fbf09a2fa4d9460033023e56cc1b195be053b353

qapi: mcgen() shouldn't indent # lines

Skip preprocessor lines when adding indentation, since that would
likely result in invalid code.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180703155648.11933-6-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>

scripts/qapi/common.py

diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index feae646..1b56065 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -1941,8 +1941,8 @@
     if indent_level:
         indent = genindent(indent_level)
         # re.subn() lacks flags support before Python 2.7, use re.compile()
-        raw = re.subn(re.compile(r'^.', re.MULTILINE),
-                      indent + r'\g<0>', raw)
+        raw = re.subn(re.compile(r'^(?!(#|$))', re.MULTILINE),
+                      indent, raw)
         raw = raw[0]
     return re.sub(re.escape(eatspace) + r' *', '', raw)