Improve performance by cutting down duplication expansions.

diff --git a/bin/oe/data.py b/bin/oe/data.py
index e6e546c..f5cd763 100644 (file)
--- a/bin/oe/data.py
+++ b/bin/oe/data.py
@@ -207,6 +207,7 @@ def expand(s, d = _data, varname = None):
                                fatal("variable %s references itself!" % varname)
                var = getVar(key, d, 1)
                if var is not None:
+                       setVar(key, var, d)
                        return var
                else:
                        return match.group()

diff --git a/bin/oe/parse/OEHandler.py b/bin/oe/parse/OEHandler.py
index e0be0f9..49f5f54 100644 (file)
--- a/bin/oe/parse/OEHandler.py
+++ b/bin/oe/parse/OEHandler.py
@@ -179,11 +179,11 @@ def feeder(lineno, s, fn, d):
                if m.group("py") is not None:
                        data.setVarFlag(key, "python", "1", d)
                else:
-                       data.setVarFlag(key, "python", None, d)
+                       data.delVarFlag(key, "python", d)
                if m.group("fr") is not None:
                        data.setVarFlag(key, "fakeroot", "1", d)
                else:
-                       data.setVarFlag(key, "fakeroot", None, d)
+                       data.delVarFlag(key, "fakeroot", d)
                return
 
        m = __export_func_regexp__.match(s)