summaryrefslogtreecommitdiff
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-03-24 18:58:59 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-25 17:25:58 +0000
commit964085f701a58c9a612e1230961fe3c22fede7ba (patch)
treeb419e68f05cea6f5bb9273db307e525ed143f208 /bitbake/lib
parent6028daedcb2e3eeab8bb7c725de4303b03625ed8 (diff)
downloadopenembedded-core-964085f701a58c9a612e1230961fe3c22fede7ba.tar.gz
openembedded-core-964085f701a58c9a612e1230961fe3c22fede7ba.tar.bz2
openembedded-core-964085f701a58c9a612e1230961fe3c22fede7ba.tar.xz
openembedded-core-964085f701a58c9a612e1230961fe3c22fede7ba.zip
data_smart: be explicit about what we make available to eval'd python code
(Bitbake rev: 6a73dda60f50e9b3e5513795d1ec7207d1446de2) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index dac7fb705..9067d54bf 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -39,6 +39,11 @@ __setvar_keyword__ = ["_append","_prepend"]
__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
__expand_python_regexp__ = re.compile(r"\${@.+?}")
+_expand_globals = {
+ "os": os,
+ "bb": bb,
+ "time": time,
+}
class DataSmart:
@@ -50,6 +55,7 @@ class DataSmart:
self._seen_overrides = seen
self.expand_cache = {}
+ self.expand_locals = {"d": self}
def expand(self,s, varname):
def var_sub(match):
@@ -66,8 +72,7 @@ class DataSmart:
def python_sub(match):
import bb
code = match.group()[3:-1]
- locals()['d'] = self
- s = eval(code)
+ s = eval(code, _expand_globals, self.expand_locals)
if type(s) == types.IntType: s = str(s)
return s