bitbake data.py: Fix unexport handling (#OE3135)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2948 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 7ad1acad1ceed676e323cd395dbd52b132e3d63b..54b2615afbaf13dd31a6dd355e09886fb6def9ff 100644 (file)
--- 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