summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 13:10:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-07 17:25:56 (GMT)
commitdf1f0ee32ee1e95b7976a755ed88df849772c2cc (patch)
tree1aebc3dce83612f02dca61cf74f78c30510fd0d3
parent26388f878957c5727f75a989cb3523114e35c0cc (diff)
downloadpoky-df1f0ee32ee1e95b7976a755ed88df849772c2cc.tar.gz
bitbake: 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. (Bitbake rev: 1a4ea02932d07c437187f67ac5b6e25ad76ee84a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 2e0647b..c4e579d 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -107,14 +107,15 @@ def get_statements(filename, absolute_filename, base_name):
107 return statements 107 return statements
108 108
109def handle(fn, d, include): 109def handle(fn, d, include):
110 global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__ 110 global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__, __inpython__, classes
111 __body__ = [] 111 __body__ = []
112 __infunc__ = "" 112 __infunc__ = ""
113 __classname__ = "" 113 __classname__ = ""
114 __residue__ = [] 114 __residue__ = []
115 115 __inpython__ = False
116 116
117 if include == 0: 117 if include == 0:
118 classes = [ None, ]
118 logger.debug(2, "BB %s: handle(data)", fn) 119 logger.debug(2, "BB %s: handle(data)", fn)
119 else: 120 else:
120 logger.debug(2, "BB %s: handle(data, include)", fn) 121 logger.debug(2, "BB %s: handle(data, include)", fn)