data.py: Fix inherits_class() so it doesn't split lists. Add unexport handling to emit_env.

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/bb/data.py b/lib/bb/data.py
index 707d2806f..d49bc1a4b 100644
--- a/lib/bb/data.py
+++ b/lib/bb/data.py
@@ -373,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:
@@ -540,7 +543,7 @@ def update_data(d):
 
 def inherits_class(klass, d):
     val = getVar('__inherit_cache', d) or []
-    if os.path.join('classes', '%s.bbclass' % klass) in val:
+    if os.path.join('classes', '%s.bbclass' % klass) in val.split():
         return True
     return False