[bitbake-devel] [PATCH] data: show value in -e when unexported
Ross Burton
ross.burton at intel.com
Wed Mar 7 17:35:38 UTC 2018
When a value has been unexported it still has a value, so write it out in a
comment to keep the output shell-like.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
bitbake/lib/bb/data.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 80a7879cb66..62fef18c40d 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -156,10 +156,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
varExpanded = d.expand(var)
- if unexport:
- o.write('unset %s\n' % varExpanded)
- return False
-
if val is None:
return False
@@ -178,15 +174,19 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
o.write("%s() {\n%s\n}\n" % (varExpanded, val))
return 1
- if export:
- o.write('export ')
-
# if we're going to output this within doublequotes,
# 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))
+
+ if unexport:
+ o.write('unset %s # "%s"\n' % (varExpanded, alter))
+ elif export:
+ o.write('export %s="%s"\n' % (varExpanded, alter))
+ else:
+ o.write('%s="%s"\n' % (varExpanded, alter))
+
return False
def emit_env(o=sys.__stdout__, d = init(), all=False):
--
2.11.0
More information about the bitbake-devel
mailing list