From c59e3bd26d863723af7ba5e16570b091ef7cdc13 Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Thu, 9 Apr 2015 15:21:49 -0500 Subject: bitbake: data.py: fixes bad substitution when running devshell Running bitbake inside make results in the exported environment variable MAKEOVERRIDES="${-*-command-variables-*-}", which the shell chokes on when trying to expand it. But of course, it probably shouldn't have been trying to expand it in the first place -- so just escape the dollar sign. (Bitbake rev: 18cd0ce6a55c9065c3f1bf223b47d817b5efcd8f) (Bitbake rev: 34226a9e02f319a7547967bbdaca3ca918927dd1) Signed-off-by: Richard Tollerton Signed-off-by: Richard Purdie Signed-off-by: Alejandro Hernandez Signed-off-by: Richard Purdie --- bitbake/lib/bb/data.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index eb628c7df3..82eefef1a6 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -238,6 +238,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): # to a shell, we need to escape the quotes in the var alter = re.sub('"', '\\"', val) alter = re.sub('\n', ' \\\n', alter) + alter = re.sub('\\$', '\\\\$', alter) o.write('%s="%s"\n' % (varExpanded, alter)) return 0 -- cgit v1.2.3-54-g00ecf