summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2015-04-09 15:21:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-11 16:26:53 +0100
commit012fb876c1cf0b3aeee3c8c168af0a8947518246 (patch)
tree06c5e7ce1b5b2945ddd778028b9471f320497c1e
parent8e386a710023e000a504e05c13da0106df0c7f3a (diff)
downloadbitbake-012fb876c1cf0b3aeee3c8c168af0a8947518246.tar.gz
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) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/data.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py
index db938be1e..99bac9ad3 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -231,6 +231,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