summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-22 11:53:17 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-22 11:53:17 +0000
commit498b4f45da04cd17f91547fa1fe0f7f47a61917e (patch)
tree8eed14feacab447a26f6c54073492d560876cf84
parentc033c91c6b8c2cc266081c9140dc873fa5ab1085 (diff)
downloadopenembedded-core-498b4f45da04cd17f91547fa1fe0f7f47a61917e.tar.gz
openembedded-core-498b4f45da04cd17f91547fa1fe0f7f47a61917e.tar.bz2
openembedded-core-498b4f45da04cd17f91547fa1fe0f7f47a61917e.tar.xz
openembedded-core-498b4f45da04cd17f91547fa1fe0f7f47a61917e.zip
bitbake data.py: Fix unexport handling (#OE3135)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2948 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--bitbake/lib/bb/data.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 7ad1acad1..54b2615af 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -370,9 +370,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
if type(val) is not types.StringType:
return 0
- if getVarFlag(var, 'matchesenv', d):
- return 0
-
if (var.find("-") != -1 or var.find(".") != -1 or var.find('{') != -1 or var.find('}') != -1 or var.find('+') != -1) and not all:
return 0
@@ -382,6 +379,9 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
o.write('unset %s\n' % varExpanded)
return 1
+ if getVarFlag(var, 'matchesenv', d):
+ return 0
+
val.rstrip()
if not val:
return 0