diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-24 11:03:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-25 11:15:11 +0100 |
commit | 994ce7b0713b0eb193c16c955f3cf1688f01b479 (patch) | |
tree | c35e91dfde405c7eb5bc0bfa5c16ed48330eda48 | |
parent | 6558abda67956e4fab1304b0cdf03c65f18fabd5 (diff) | |
download | ast2050-yocto-poky-994ce7b0713b0eb193c16c955f3cf1688f01b479.zip ast2050-yocto-poky-994ce7b0713b0eb193c16c955f3cf1688f01b479.tar.gz |
BBHandler: Tweak some data store access methods to the preferred syntax
(Bitbake rev: d7ec0f90354e60c415a01429bf26746c1d63b7ad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 815bce1..625a2a2 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -69,7 +69,7 @@ def supports(fn, d): return os.path.splitext(fn)[-1] in [".bb", ".bbclass", ".inc"] def inherit(files, fn, lineno, d): - __inherit_cache = data.getVar('__inherit_cache', d) or [] + __inherit_cache = d.getVar('__inherit_cache') or [] files = d.expand(files).split() for file in files: if not os.path.isabs(file) and not file.endswith(".bbclass"): @@ -80,7 +80,7 @@ def inherit(files, fn, lineno, d): __inherit_cache.append( file ) data.setVar('__inherit_cache', __inherit_cache, d) include(fn, file, lineno, d, "inherit") - __inherit_cache = data.getVar('__inherit_cache', d) or [] + __inherit_cache = d.getVar('__inherit_cache') or [] def get_statements(filename, absolute_filename, base_name): global cached_statements @@ -126,13 +126,13 @@ def handle(fn, d, include): if ext == ".bbclass": __classname__ = root classes.append(__classname__) - __inherit_cache = data.getVar('__inherit_cache', d) or [] + __inherit_cache = d.getVar('__inherit_cache') or [] if not fn in __inherit_cache: __inherit_cache.append(fn) data.setVar('__inherit_cache', __inherit_cache, d) if include != 0: - oldfile = data.getVar('FILE', d) + oldfile = d.getVar('FILE') else: oldfile = None |