summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 11:03:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-25 11:15:11 +0100
commit994ce7b0713b0eb193c16c955f3cf1688f01b479 (patch)
treec35e91dfde405c7eb5bc0bfa5c16ed48330eda48 /bitbake
parent6558abda67956e4fab1304b0cdf03c65f18fabd5 (diff)
downloadpoky-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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py8
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 815bce1d75..625a2a21fd 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):
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, fn, lineno, d): 71def inherit(files, fn, lineno, d):
72 __inherit_cache = data.getVar('__inherit_cache', d) or [] 72 __inherit_cache = d.getVar('__inherit_cache') or []
73 files = d.expand(files).split() 73 files = d.expand(files).split()
74 for file in files: 74 for file in files:
75 if not os.path.isabs(file) and not file.endswith(".bbclass"): 75 if not os.path.isabs(file) and not file.endswith(".bbclass"):
@@ -80,7 +80,7 @@ def inherit(files, fn, lineno, d):
80 __inherit_cache.append( file ) 80 __inherit_cache.append( file )
81 data.setVar('__inherit_cache', __inherit_cache, d) 81 data.setVar('__inherit_cache', __inherit_cache, d)
82 include(fn, file, lineno, d, "inherit") 82 include(fn, file, lineno, d, "inherit")
83 __inherit_cache = data.getVar('__inherit_cache', d) or [] 83 __inherit_cache = d.getVar('__inherit_cache') or []
84 84
85def get_statements(filename, absolute_filename, base_name): 85def get_statements(filename, absolute_filename, base_name):
86 global cached_statements 86 global cached_statements
@@ -126,13 +126,13 @@ def handle(fn, d, include):
126 if ext == ".bbclass": 126 if ext == ".bbclass":
127 __classname__ = root 127 __classname__ = root
128 classes.append(__classname__) 128 classes.append(__classname__)
129 __inherit_cache = data.getVar('__inherit_cache', d) or [] 129 __inherit_cache = d.getVar('__inherit_cache') or []
130 if not fn in __inherit_cache: 130 if not fn in __inherit_cache:
131 __inherit_cache.append(fn) 131 __inherit_cache.append(fn)
132 data.setVar('__inherit_cache', __inherit_cache, d) 132 data.setVar('__inherit_cache', __inherit_cache, d)
133 133
134 if include != 0: 134 if include != 0:
135 oldfile = data.getVar('FILE', d) 135 oldfile = d.getVar('FILE')
136 else: 136 else:
137 oldfile = None 137 oldfile = None
138 138