From 94b60d1247be4ce42eaefafe13e73169bd978bd7 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 30 Mar 2010 20:06:07 -0700 Subject: Consolidate the exec/eval bits, switch anonfunc to better_exec, etc The methodpool, ${@} expansions, anonymous python functions, event handlers now all run with the same global context, ensuring a consistent environment for them. Added a bb.utils.better_eval function which does an eval() with the same globals as better_exec. (Bitbake rev: 424d7e267b009cc19b8503eadab782736d9597d0) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/build.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/bb/build.py') diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 43dbfc136..16d69281f 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -203,16 +203,14 @@ def exec_func_python(func, d, runfile, logfile): import re, os bbfile = bb.data.getVar('FILE', d, 1) - tmp = "def " + func + "():\n%s" % data.getVar(func, d) - tmp += '\n' + func + '()' + tmp = "def " + func + "(d):\n%s" % data.getVar(func, d) + tmp += '\n' + func + '(d)' f = open(runfile, "w") f.write(tmp) comp = utils.better_compile(tmp, func, bbfile) - g = {} # globals - g['d'] = d try: - utils.better_exec(comp, g, tmp, bbfile) + utils.better_exec(comp, {"d": d}, tmp, bbfile) except: (t,value,tb) = sys.exc_info() -- cgit v1.2.3