From: Richard Purdie Date: Fri, 7 Dec 2012 13:10:51 +0000 (+0000) Subject: BBHandler: Ensure parser state engine is correctly reset for new parsing X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3dc5e896a97154914cee6c47900e3bb2a2627cdb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git BBHandler: Ensure parser state engine is correctly reset for new parsing The classes variable in particular could be in an odd state if parsing of a previous recipe had abruptly ended. Signed-off-by: Richard Purdie --- diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index 2e0647b5df2..c4e579d073e 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -107,14 +107,15 @@ def get_statements(filename, absolute_filename, base_name): return statements def handle(fn, d, include): - global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__ + global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__, __inpython__, classes __body__ = [] __infunc__ = "" __classname__ = "" __residue__ = [] - + __inpython__ = False if include == 0: + classes = [ None, ] logger.debug(2, "BB %s: handle(data)", fn) else: logger.debug(2, "BB %s: handle(data, include)", fn)