From: Chris Larson <chris_larson@mentor.com>
Date: Mon, 14 Feb 2011 17:41:50 +0000 (-0500)
Subject: utils: drop exported var env caching for oe_popen
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c751c1912990465f908bc31efd8a64228a014e41;p=openembedded.git

utils: drop exported var env caching for oe_popen

This was dangerous, as an oe_run executed from the configuration metadata
would result in caching the config metadata information, rather than the final
metadata information.  We could also cache it by the datasmart instance, but I
don't think its worth the trouble at this time, particularly given the next
bitbake release exports all exported vars into the process environment
automatically, avoiding the need for any of this.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---

diff --git a/classes/utils.bbclass b/classes/utils.bbclass
index eea084ac3a..7591d47df4 100644
--- a/classes/utils.bbclass
+++ b/classes/utils.bbclass
@@ -62,13 +62,10 @@ def is_machine_specific(d):
             return True
 
 def oe_popen_env(d):
-    env = d.getVar("__oe_popen_env", False)
-    if env is None:
-        env = {}
-        for v in d.keys():
-            if d.getVarFlag(v, "export"):
-                env[v] = d.getVar(v, True) or ""
-        d.setVar("__oe_popen_env", env)
+    env = {}
+    for v in d.keys():
+        if d.getVarFlag(v, "export"):
+            env[v] = d.getVar(v, True) or ""
     return env
 
 def oe_run(d, cmd, **kwargs):