summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/parse_py/BBHandler.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 2d6e331a1d..125f458de7 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -68,10 +68,8 @@ def supports(fn, d):
68 """Return True if fn has a supported extension""" 68 """Return True if fn has a supported extension"""
69 return os.path.splitext(fn)[-1] in [".bb", ".bbclass", ".inc"] 69 return os.path.splitext(fn)[-1] in [".bb", ".bbclass", ".inc"]
70 70
71def inherit(files, d): 71def inherit(files, fn, lineno, d):
72 __inherit_cache = data.getVar('__inherit_cache', d) or [] 72 __inherit_cache = data.getVar('__inherit_cache', d) or []
73 fn = ""
74 lineno = 0
75 for file in files: 73 for file in files:
76 file = data.expand(file, d) 74 file = data.expand(file, d)
77 if not os.path.isabs(file) and not file.endswith(".bbclass"): 75 if not os.path.isabs(file) and not file.endswith(".bbclass"):
@@ -81,7 +79,7 @@ def inherit(files, d):
81 logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) 79 logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file)
82 __inherit_cache.append( file ) 80 __inherit_cache.append( file )
83 data.setVar('__inherit_cache', __inherit_cache, d) 81 data.setVar('__inherit_cache', __inherit_cache, d)
84 include(fn, file, d, "inherit") 82 include(fn, file, lineno, d, "inherit")
85 __inherit_cache = data.getVar('__inherit_cache', d) or [] 83 __inherit_cache = data.getVar('__inherit_cache', d) or []
86 84
87def get_statements(filename, absolute_filename, base_name): 85def get_statements(filename, absolute_filename, base_name):