diff options
| author |   Chris Larson <clarson@kergoth.com> | 2010-03-01 18:45:15 -0500 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2010-03-01 18:45:15 -0500 |
| commit | 3062e96181fe845cfd286990b0216888ddd3d228 (patch) | |
| tree | 6a3cb939cf94ceda8b866bd61a9cd3d079ea9494 | |
| parent | 74f50fbca194c9c72bd2a540f4b9de458cb08e2d (diff) | |
| download | bitbake-3062e96181fe845cfd286990b0216888ddd3d228.tar.gz | |
Fix issues with BBCLASSEXTEND set by anonymous python, and rename some variables to improve code clarity
Signed-off-by: Chris Larson <clarson@kergoth.com>
| -rw-r--r-- | lib/bb/parse/parse_py/BBHandler.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index ea3478ce3..4641c13d9 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -152,26 +152,28 @@ def handle(fn, d, include): classes.remove(__classname__) else: if include == 0: - if data.getVar('BBCLASSEXTEND', d, 1): - based = bb.data.createCopy(d) - else: - based = d + safe_d = d + d = bb.data.createCopy(safe_d) try: - ast.finalise(fn, based) + ast.finalise(fn, d) except bb.parse.SkipPackage: - bb.data.setVar("__SKIPPED", True, based) - darray = {"": based} + bb.data.setVar("__SKIPPED", True, d) + darray = {"": d} - for cls in (data.getVar('BBCLASSEXTEND', based, 1) or "").split(): + 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) - based = bb.data.createCopy(d) - data.setVar('PN', pn + '-' + cls, based) - inherit([cls], based) + variant_d = bb.data.createCopy(safe_d) + data.setVar('PN', pn + '-' + cls, variant_d) + inherit([cls], variant_d) try: - ast.finalise(fn, based) + ast.finalise(fn, variant_d) except bb.parse.SkipPackage: - bb.data.setVar("__SKIPPED", True, based) - darray[cls] = based + bb.data.setVar("__SKIPPED", True, variant_d) + darray[cls] = variant_d return darray if oldfile: |