diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-09 22:33:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-13 12:15:55 +0100 |
commit | 8f74881037bb01013d3d439dc0c269909a198c1c (patch) | |
tree | 0747a3e7e3bcb5c3191fc8654182debb1e0730d4 /lib/bb/utils.py | |
parent | 6d1379c8818400e5cdc442e6142f08a110fd5b95 (diff) | |
download | bitbake-contrib-8f74881037bb01013d3d439dc0c269909a198c1c.tar.gz |
data_smart/utils: Add 'd' to the context used for better_eval in python expansion
If a line like:
foo=${@' '.join([d.getVar('D', True) + x for x in (' '.join([d.getVar('FILES_bash-' + p, True) or '' for p in ['lib', 'dev', 'staticdev', 'doc', 'locale', 'ptest']])).split()])}
is added to a function like do_install, it fails with Exception name 'd'
is not defined. This is due to a change of behaviour in python 3 compared
to python 2. Generator expressions, dict comprehensions and set comprehensions
are executed in a new scope but list comprehensions in python 2.x are not. In
python 3 they all use a new scope.
To allow these kinds of expressions to work, the easiest approach is
to add 'd' to the global context. To do this, an extra optional parameter
is added to better_eval and we use that to add 'd'.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/utils.py')
-rw-r--r-- | lib/bb/utils.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 8f75871c1..0a1bf6880 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -37,6 +37,7 @@ import errno import signal import ast import collections +import copy from subprocess import getstatusoutput from contextlib import contextmanager from ctypes import cdll @@ -407,8 +408,13 @@ def better_exec(code, context, text = None, realfile = "<code>", pythonexception def simple_exec(code, context): exec(code, get_context(), context) -def better_eval(source, locals): - return eval(source, get_context(), locals) +def better_eval(source, locals, extraglobals = None): + ctx = get_context() + if extraglobals: + ctx = copy.copy(ctx) + for g in extraglobals: + ctx[g] = extraglobals[g] + return eval(source, ctx, locals) @contextmanager def fileslocked(files): |