bitbake: event/ast: Use better_exec instead of simple_exec
This improves the stacktraces dumped by bitbake when for example anonymous python functions fail. Also default to passing code strings to better_exec to match the behaviour of simple_exec to aid the transition. (Bitbake rev: 7e8205929ae953731a6854ea80b197847cff5771) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1a7069e97b
commit
21773a997a
|
@ -175,7 +175,7 @@ def register(name, handler):
|
||||||
_handlers[name] = noop
|
_handlers[name] = noop
|
||||||
return
|
return
|
||||||
env = {}
|
env = {}
|
||||||
bb.utils.simple_exec(code, env)
|
bb.utils.better_exec(code, env)
|
||||||
func = bb.utils.better_eval(name, env)
|
func = bb.utils.better_eval(name, env)
|
||||||
_handlers[name] = func
|
_handlers[name] = func
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -320,7 +320,7 @@ def finalize(fn, d, variant = None):
|
||||||
code = []
|
code = []
|
||||||
for funcname in d.getVar("__BBANONFUNCS") or []:
|
for funcname in d.getVar("__BBANONFUNCS") or []:
|
||||||
code.append("%s(d)" % funcname)
|
code.append("%s(d)" % funcname)
|
||||||
bb.utils.simple_exec("\n".join(code), {"d": d})
|
bb.utils.better_exec("\n".join(code), {"d": d})
|
||||||
bb.data.update_data(d)
|
bb.data.update_data(d)
|
||||||
|
|
||||||
tasklist = d.getVar('__BBTASKS') or []
|
tasklist = d.getVar('__BBTASKS') or []
|
||||||
|
|
|
@ -218,13 +218,15 @@ def better_compile(text, file, realfile, mode = "exec"):
|
||||||
|
|
||||||
raise
|
raise
|
||||||
|
|
||||||
def better_exec(code, context, text, realfile = "<code>"):
|
def better_exec(code, context, text = None, realfile = "<code>", data = None):
|
||||||
"""
|
"""
|
||||||
Similiar to better_compile, better_exec will
|
Similiar to better_compile, better_exec will
|
||||||
print the lines that are responsible for the
|
print the lines that are responsible for the
|
||||||
error.
|
error.
|
||||||
"""
|
"""
|
||||||
import bb.parse
|
import bb.parse
|
||||||
|
if not text:
|
||||||
|
text = code
|
||||||
if not hasattr(code, "co_filename"):
|
if not hasattr(code, "co_filename"):
|
||||||
code = better_compile(code, realfile, realfile)
|
code = better_compile(code, realfile, realfile)
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue