From 44549775ebc01edbca7d934875a43a2d315bdd9b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 13 Oct 2009 08:25:34 +0100 Subject: bitbake: Add bb and os to __builtins__, not the exec function global Signed-off-by: Richard Purdie --- bitbake-dev/lib/bb/build.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bitbake-dev') diff --git a/bitbake-dev/lib/bb/build.py b/bitbake-dev/lib/bb/build.py index 05b7d94d13..b37bcf63bc 100644 --- a/bitbake-dev/lib/bb/build.py +++ b/bitbake-dev/lib/bb/build.py @@ -28,6 +28,13 @@ from bb import data, event, mkdirhier, utils import bb, os, sys +# When we execute a python function we'd like certain things +# in all namespaces, hence we add them to __builtins__ +# If we do not do this and use the exec globals, they will +# not be available to subfunctions. +__builtins__['bb'] = bb +__builtins__['os'] = os + # events class FuncFailed(Exception): """ @@ -205,8 +212,6 @@ def exec_func_python(func, d, runfile, logfile): f.write(tmp) comp = utils.better_compile(tmp, func, bbfile) g = {} # globals - g['bb'] = bb - g['os'] = os g['d'] = d try: utils.better_exec(comp, g, tmp, bbfile) -- cgit v1.2.3-54-g00ecf