summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 2c39316325..20fa60355e 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -72,9 +72,9 @@ def inherit(files, d):
72 if not file in __inherit_cache: 72 if not file in __inherit_cache:
73 bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s:%d: inheriting %s" % (fn, lineno, file)) 73 bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s:%d: inheriting %s" % (fn, lineno, file))
74 __inherit_cache.append( file ) 74 __inherit_cache.append( file )
75 data.setVar('__inherit_cache', __inherit_cache, d)
75 include(fn, file, d, "inherit") 76 include(fn, file, d, "inherit")
76 data.setVar('__inherit_cache', __inherit_cache, d) 77 __inherit_cache = data.getVar('__inherit_cache', d) or []
77
78 78
79def handle(fn, d, include = 0): 79def handle(fn, d, include = 0):
80 global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__ 80 global __func_start_regexp__, __inherit_regexp__, __export_func_regexp__, __addtask_regexp__, __addhandler_regexp__, __infunc__, __body__, __residue__
@@ -377,6 +377,8 @@ def vars_from_file(mypkg, d):
377 myfile = os.path.splitext(os.path.basename(mypkg)) 377 myfile = os.path.splitext(os.path.basename(mypkg))
378 parts = myfile[0].split('_') 378 parts = myfile[0].split('_')
379 __pkgsplit_cache__[mypkg] = parts 379 __pkgsplit_cache__[mypkg] = parts
380 if len(parts) > 3:
381 raise ParseError("Unable to generate default variables from the filename: %s (too many underscores)" % mypkg)
380 exp = 3 - len(parts) 382 exp = 3 - len(parts)
381 tmplist = [] 383 tmplist = []
382 while exp != 0: 384 while exp != 0: