summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/data.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 819dff9679..19066c9adc 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -271,6 +271,9 @@ def expandKeys(alterdata, readdata = None):
readdata = alterdata
for key in keys(alterdata):
+ if not '${' in key:
+ continue
+
ekey = expand(key, readdata)
if key == ekey:
continue
@@ -370,6 +373,9 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
# NOTE: should probably check for unbalanced {} within the var
o.write("%s() {\n%s\n}\n" % (varExpanded, val))
else:
+ if getVarFlag(var, "unexport", d):
+ o.write('unset %s\n' % varExpanded)
+ return 1
if getVarFlag(var, "export", d):
o.write('export ')
else: