summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-03-30 16:21:23 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:31 +0100
commitd8c8612d92fd243d395c97285f8c9b5d80a93b45 (patch)
treef3d3a1f7c6f030c9856ee6b3ef7f82b14e7db40e /bitbake
parentf8a8ec5ceb4b5f7a03e4a0024e5fe06ec8e7ad0a (diff)
downloadpoky-d8c8612d92fd243d395c97285f8c9b5d80a93b45.tar.gz
Two minor changes to the way python snippet expansion happens
- Use a single dictionary for the context, both global & local, since for some reason it chokes wanting a global "d" rather than a local in the metadata. - First compile the string into a code object before running eval, so we can include the variable name in an evaluation error. (Bitbake rev: 49534d928a37e0804ca84eed186cd22363023b2e) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data_smart.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 9067d54bfa..54ed72823b 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -39,11 +39,6 @@ __setvar_keyword__ = ["_append","_prepend"]
39__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?') 39__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
40__expand_var_regexp__ = re.compile(r"\${[^{}]+}") 40__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
41__expand_python_regexp__ = re.compile(r"\${@.+?}") 41__expand_python_regexp__ = re.compile(r"\${@.+?}")
42_expand_globals = {
43 "os": os,
44 "bb": bb,
45 "time": time,
46}
47 42
48 43
49class DataSmart: 44class DataSmart:
@@ -55,7 +50,12 @@ class DataSmart:
55 self._seen_overrides = seen 50 self._seen_overrides = seen
56 51
57 self.expand_cache = {} 52 self.expand_cache = {}
58 self.expand_locals = {"d": self} 53 self.expand_context = {
54 "os": os,
55 "bb": bb,
56 "time": time,
57 "d": self
58 }
59 59
60 def expand(self,s, varname): 60 def expand(self,s, varname):
61 def var_sub(match): 61 def var_sub(match):
@@ -70,9 +70,9 @@ class DataSmart:
70 return match.group() 70 return match.group()
71 71
72 def python_sub(match): 72 def python_sub(match):
73 import bb
74 code = match.group()[3:-1] 73 code = match.group()[3:-1]
75 s = eval(code, _expand_globals, self.expand_locals) 74 codeobj = compile(code.strip(), varname or "<expansion>", "eval")
75 s = eval(codeobj, self.expand_context)
76 if type(s) == types.IntType: s = str(s) 76 if type(s) == types.IntType: s = str(s)
77 return s 77 return s
78 78