summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 11:46:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 12:35:18 +0000
commit9753283a3fe417ba827e4cee153184b6a25699de (patch)
treefdaba27dacc7e67837acfb1fa690747e856bff3b
parent3db277b18b8923daca545aa53bcfbbe9d43d3baa (diff)
downloadpoky-9753283a3fe417ba827e4cee153184b6a25699de.tar.gz
bitbake: BBHandler/data: Standardise some setVar access formats
(Bitbake rev: e12c1a485f96a4701144ac81179ae1af348e5bf3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/data.py6
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 478a482d88..2c3e905a77 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -158,7 +158,7 @@ def expandKeys(alterdata, readdata = None):
158 158
159 for key in todolist: 159 for key in todolist:
160 ekey = todolist[key] 160 ekey = todolist[key]
161 renameVar(key, ekey, alterdata) 161 alterdata.renameVar(key, ekey)
162 162
163def inheritFromOS(d, savedenv, permitted): 163def inheritFromOS(d, savedenv, permitted):
164 """Inherit variables from the initial environment.""" 164 """Inherit variables from the initial environment."""
@@ -166,9 +166,9 @@ def inheritFromOS(d, savedenv, permitted):
166 for s in savedenv.keys(): 166 for s in savedenv.keys():
167 if s in permitted: 167 if s in permitted:
168 try: 168 try:
169 setVar(s, getVar(s, savedenv, True), d) 169 d.setVar(s, getVar(s, savedenv, True))
170 if s in exportlist: 170 if s in exportlist:
171 setVarFlag(s, "export", True, d) 171 d.setVarFlag(s, "export", True)
172 except TypeError: 172 except TypeError:
173 pass 173 pass
174 174
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 2ee8ebd28f..c585b60fee 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -84,7 +84,7 @@ def inherit(files, fn, lineno, d):
84 if not file in __inherit_cache: 84 if not file in __inherit_cache:
85 logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) 85 logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file)
86 __inherit_cache.append( file ) 86 __inherit_cache.append( file )
87 data.setVar('__inherit_cache', __inherit_cache, d) 87 d.setVar('__inherit_cache', __inherit_cache)
88 include(fn, file, lineno, d, "inherit") 88 include(fn, file, lineno, d, "inherit")
89 __inherit_cache = d.getVar('__inherit_cache') or [] 89 __inherit_cache = d.getVar('__inherit_cache') or []
90 90
@@ -134,7 +134,7 @@ def handle(fn, d, include):
134 __inherit_cache = d.getVar('__inherit_cache') or [] 134 __inherit_cache = d.getVar('__inherit_cache') or []
135 if not fn in __inherit_cache: 135 if not fn in __inherit_cache:
136 __inherit_cache.append(fn) 136 __inherit_cache.append(fn)
137 data.setVar('__inherit_cache', __inherit_cache, d) 137 d.setVar('__inherit_cache', __inherit_cache)
138 138
139 if include != 0: 139 if include != 0:
140 oldfile = d.getVar('FILE') 140 oldfile = d.getVar('FILE')
@@ -151,7 +151,7 @@ def handle(fn, d, include):
151 151
152 # DONE WITH PARSING... time to evaluate 152 # DONE WITH PARSING... time to evaluate
153 if ext != ".bbclass": 153 if ext != ".bbclass":
154 data.setVar('FILE', abs_fn, d) 154 d.setVar('FILE', abs_fn)
155 155
156 try: 156 try:
157 statements.eval(d) 157 statements.eval(d)