From c6be487f9bd5d95915f2495d555b9f539adb1d44 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 2 Mar 2018 18:16:33 +0000 Subject: parse/ast: Abstract anonymous function execution into a function This allows us to call this code from other contexts without duplicating it. Signed-off-by: Richard Purdie --- lib/bb/parse/ast.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index dba4540f5..6690dc51c 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -335,6 +335,12 @@ def handleInherit(statements, filename, lineno, m): classes = m.group(1) statements.append(InheritNode(filename, lineno, classes)) +def runAnonFuncs(d): + code = [] + for funcname in d.getVar("__BBANONFUNCS", False) or []: + code.append("%s(d)" % funcname) + bb.utils.better_exec("\n".join(code), {"d": d}) + def finalize(fn, d, variant = None): saved_handlers = bb.event.get_handlers().copy() @@ -349,10 +355,7 @@ def finalize(fn, d, variant = None): bb.event.fire(bb.event.RecipePreFinalise(fn), d) bb.data.expandKeys(d) - code = [] - for funcname in d.getVar("__BBANONFUNCS", False) or []: - code.append("%s(d)" % funcname) - bb.utils.better_exec("\n".join(code), {"d": d}) + runAnonFuncs(d) tasklist = d.getVar('__BBTASKS', False) or [] bb.event.fire(bb.event.RecipeTaskPreProcess(fn, list(tasklist)), d) -- cgit 1.2.3-korg