Patchwork [bitbake-devel] event/ast: Use better_exec instead of simple_exec

login
register
mail settings
Submitter Richard Purdie
Date Aug. 21, 2012, 4:27 p.m.
Message ID <1345566476.3907.95.camel@ted>
Download mbox | patch
Permalink /patch/35067/
State New
Headers show

Comments

Richard Purdie - Aug. 21, 2012, 4:27 p.m.
This improves the stack traces 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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 20923b5..fa179d8 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -175,7 +175,7 @@  def register(name, handler):
                 _handlers[name] = noop
                 return
             env = {}
-            bb.utils.simple_exec(code, env)
+            bb.utils.better_exec(code, env)
             func = bb.utils.better_eval(name, env)
             _handlers[name] = func
         else:
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 86f9463..b88d5f5 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -320,7 +320,7 @@  def finalize(fn, d, variant = None):
     code = []
     for funcname in d.getVar("__BBANONFUNCS") or []:
         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)
 
     tasklist = d.getVar('__BBTASKS') or []
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index ee4ef73..da12b14 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -218,7 +218,7 @@  def better_compile(text, file, realfile, mode = "exec"):
 
         raise
 
-def better_exec(code, context, text, realfile = "<code>"):
+def better_exec(code, context, text = code, realfile = "<code>"):
     """
     Similiar to better_compile, better_exec will
     print the lines that are responsible for the