diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py')
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 4641c13d9..262c883c9 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -152,30 +152,8 @@ def handle(fn, d, include): classes.remove(__classname__) else: if include == 0: - safe_d = d - d = bb.data.createCopy(safe_d) - try: - ast.finalise(fn, d) - except bb.parse.SkipPackage: - bb.data.setVar("__SKIPPED", True, d) - darray = {"": d} - - extended = bb.data.getVar("BBCLASSEXTEND", d, True) - if extended: - bb.data.setVar("BBCLASSEXTEND", extended, safe_d) - - for cls in (extended or "").split(): - pn = data.getVar('PN', d, True) - variant_d = bb.data.createCopy(safe_d) - data.setVar('PN', pn + '-' + cls, variant_d) - inherit([cls], variant_d) - try: - ast.finalise(fn, variant_d) - except bb.parse.SkipPackage: - bb.data.setVar("__SKIPPED", True, variant_d) - darray[cls] = variant_d - return darray - + return ast.multi_finalize(fn, d) + if oldfile: bb.data.setVar("FILE", oldfile, d) |