summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-03-30 16:59:46 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:31 +0100
commiteb167737041d8754988d153e0495268f03b6e809 (patch)
tree192e2578ed1889fa93835c4d6027382f58403bb0
parentd8c8612d92fd243d395c97285f8c9b5d80a93b45 (diff)
downloadopenembedded-core-eb167737041d8754988d153e0495268f03b6e809.tar.gz
openembedded-core-eb167737041d8754988d153e0495268f03b6e809.tar.bz2
openembedded-core-eb167737041d8754988d153e0495268f03b6e809.tar.xz
openembedded-core-eb167737041d8754988d153e0495268f03b6e809.zip
Pass an empty locals dict in expansion, since list comprehensions apparently leak their '_' helper variable
(Bitbake rev: 97da0cebbaf4dd1b46e58bd2e80cab6c007ae7c9) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/data_smart.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 54ed72823..55a6f3143 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -50,7 +50,7 @@ class DataSmart:
self._seen_overrides = seen
self.expand_cache = {}
- self.expand_context = {
+ self.expand_globals = {
"os": os,
"bb": bb,
"time": time,
@@ -72,7 +72,7 @@ class DataSmart:
def python_sub(match):
code = match.group()[3:-1]
codeobj = compile(code.strip(), varname or "<expansion>", "eval")
- s = eval(codeobj, self.expand_context)
+ s = eval(codeobj, self.expand_globals, {})
if type(s) == types.IntType: s = str(s)
return s