[U-Boot] [PATCH 1/1] buildman: Improve [make-flags] section parser to allow quoted strings

[U-Boot] [PATCH 1/1] buildman: Improve [make-flags] section parser to allow quoted strings

[Cristian Ciocaltea]

The parser responsible for the '[make-flags]' section in
the '.buildman' settings file is currently not able to
handle quoted strings, as given in the sample bellow:

[make-flags]
qemu_arm=HOSTCC="cc -isystem /add/include" HOSTLDFLAGS="-L/add/lib"

This patch replaces the simple string splitter based on the <space>
delimiter with a regex tokenizer that preserves spaces inside double
quoted strings.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
---
 tools/buildman/toolchain.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index cc26e2ede5..086a4d47cd 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -435,9 +435,10 @@ class Toolchains:
         self._make_flags['target'] = board.target
         arg_str = self.ResolveReferences(self._make_flags,
                            self._make_flags.get(board.target, ''))
-        args = arg_str.split(' ')
+        args = re.findall("(?:\".*?\"|\S)+", arg_str)
         i = 0
         while i < len(args):
+            args[i] = args[i].replace('"', '')
             if not args[i]:
                 del args[i]
             else:
-- 
2.17.1

[PATCH 1/1] buildman: Improve [make-flags] section parser to allow quoted strings

[Simon Glass]

On Sun, 24 Nov 2019 at 13:30, Cristian Ciocaltea
<cristian.ciocaltea@gmail.com> wrote:
>
> The parser responsible for the '[make-flags]' section in
> the '.buildman' settings file is currently not able to
> handle quoted strings, as given in the sample bellow:
>
> [make-flags]
> qemu_arm=HOSTCC="cc -isystem /add/include" HOSTLDFLAGS="-L/add/lib"
>
> This patch replaces the simple string splitter based on the <space>
> delimiter with a regex tokenizer that preserves spaces inside double
> quoted strings.
>
> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
> ---
>  tools/buildman/toolchain.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>