diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-18 15:14:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:57:53 +0100 |
commit | 69b69193411849de71cf7c81735c3239e28a2940 (patch) | |
tree | 054081264a49c9aa3002bc358ab0c4d7b7239015 /bitbake/lib/bb/parse/ast.py | |
parent | 86d30d756a60d181a95cf07041920a367a0cd0ba (diff) | |
download | poky-69b69193411849de71cf7c81735c3239e28a2940.tar.gz |
bitbake: bitbake: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False)
since at some point in the future, having the default of expansion would
be nice. This is the first step towards that.
This patch was mostly made using the command:
sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`
(Bitbake rev: 659ef95c9b8aced3c4ded81c48bcc0fbde4d429f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse/ast.py')
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index c53ab17d68..1130b1474c 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -85,7 +85,7 @@ class DataNode(AstNode): | |||
85 | if 'flag' in self.groupd and self.groupd['flag'] != None: | 85 | if 'flag' in self.groupd and self.groupd['flag'] != None: |
86 | return data.getVarFlag(key, self.groupd['flag'], noweakdefault=True) | 86 | return data.getVarFlag(key, self.groupd['flag'], noweakdefault=True) |
87 | else: | 87 | else: |
88 | return data.getVar(key, noweakdefault=True) | 88 | return data.getVar(key, False, noweakdefault=True) |
89 | 89 | ||
90 | def eval(self, data): | 90 | def eval(self, data): |
91 | groupd = self.groupd | 91 | groupd = self.groupd |
@@ -152,7 +152,7 @@ class MethodNode(AstNode): | |||
152 | funcname = ("__anon_%s_%s" % (self.lineno, self.filename.translate(MethodNode.tr_tbl))) | 152 | funcname = ("__anon_%s_%s" % (self.lineno, self.filename.translate(MethodNode.tr_tbl))) |
153 | text = "def %s(d):\n" % (funcname) + text | 153 | text = "def %s(d):\n" % (funcname) + text |
154 | bb.methodpool.insert_method(funcname, text, self.filename) | 154 | bb.methodpool.insert_method(funcname, text, self.filename) |
155 | anonfuncs = data.getVar('__BBANONFUNCS') or [] | 155 | anonfuncs = data.getVar('__BBANONFUNCS', False) or [] |
156 | anonfuncs.append(funcname) | 156 | anonfuncs.append(funcname) |
157 | data.setVar('__BBANONFUNCS', anonfuncs) | 157 | data.setVar('__BBANONFUNCS', anonfuncs) |
158 | data.setVar(funcname, text) | 158 | data.setVar(funcname, text) |
@@ -184,7 +184,7 @@ class MethodFlagsNode(AstNode): | |||
184 | self.m = m | 184 | self.m = m |
185 | 185 | ||
186 | def eval(self, data): | 186 | def eval(self, data): |
187 | if data.getVar(self.key): | 187 | if data.getVar(self.key, False): |
188 | # clean up old version of this piece of metadata, as its | 188 | # clean up old version of this piece of metadata, as its |
189 | # flags could cause problems | 189 | # flags could cause problems |
190 | data.setVarFlag(self.key, 'python', None) | 190 | data.setVarFlag(self.key, 'python', None) |
@@ -209,10 +209,10 @@ class ExportFuncsNode(AstNode): | |||
209 | for func in self.n: | 209 | for func in self.n: |
210 | calledfunc = self.classname + "_" + func | 210 | calledfunc = self.classname + "_" + func |
211 | 211 | ||
212 | if data.getVar(func) and not data.getVarFlag(func, 'export_func'): | 212 | if data.getVar(func, False) and not data.getVarFlag(func, 'export_func'): |
213 | continue | 213 | continue |
214 | 214 | ||
215 | if data.getVar(func): | 215 | if data.getVar(func, False): |
216 | data.setVarFlag(func, 'python', None) | 216 | data.setVarFlag(func, 'python', None) |
217 | data.setVarFlag(func, 'func', None) | 217 | data.setVarFlag(func, 'func', None) |
218 | 218 | ||
@@ -255,7 +255,7 @@ class BBHandlerNode(AstNode): | |||
255 | self.hs = fns.split() | 255 | self.hs = fns.split() |
256 | 256 | ||
257 | def eval(self, data): | 257 | def eval(self, data): |
258 | bbhands = data.getVar('__BBHANDLERS') or [] | 258 | bbhands = data.getVar('__BBHANDLERS', False) or [] |
259 | for h in self.hs: | 259 | for h in self.hs: |
260 | bbhands.append(h) | 260 | bbhands.append(h) |
261 | data.setVarFlag(h, "handler", 1) | 261 | data.setVarFlag(h, "handler", 1) |
@@ -315,22 +315,22 @@ def handleInherit(statements, filename, lineno, m): | |||
315 | 315 | ||
316 | def finalize(fn, d, variant = None): | 316 | def finalize(fn, d, variant = None): |
317 | all_handlers = {} | 317 | all_handlers = {} |
318 | for var in d.getVar('__BBHANDLERS') or []: | 318 | for var in d.getVar('__BBHANDLERS', False) or []: |
319 | # try to add the handler | 319 | # try to add the handler |
320 | bb.event.register(var, d.getVar(var), (d.getVarFlag(var, "eventmask", True) or "").split()) | 320 | bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask", True) or "").split()) |
321 | 321 | ||
322 | bb.event.fire(bb.event.RecipePreFinalise(fn), d) | 322 | bb.event.fire(bb.event.RecipePreFinalise(fn), d) |
323 | 323 | ||
324 | bb.data.expandKeys(d) | 324 | bb.data.expandKeys(d) |
325 | bb.data.update_data(d) | 325 | bb.data.update_data(d) |
326 | code = [] | 326 | code = [] |
327 | for funcname in d.getVar("__BBANONFUNCS") or []: | 327 | for funcname in d.getVar("__BBANONFUNCS", False) or []: |
328 | code.append("%s(d)" % funcname) | 328 | code.append("%s(d)" % funcname) |
329 | bb.utils.better_exec("\n".join(code), {"d": d}) | 329 | bb.utils.better_exec("\n".join(code), {"d": d}) |
330 | bb.data.update_data(d) | 330 | bb.data.update_data(d) |
331 | 331 | ||
332 | tasklist = d.getVar('__BBTASKS') or [] | 332 | tasklist = d.getVar('__BBTASKS', False) or [] |
333 | deltasklist = d.getVar('__BBDELTASKS') or [] | 333 | deltasklist = d.getVar('__BBDELTASKS', False) or [] |
334 | bb.build.add_tasks(tasklist, deltasklist, d) | 334 | bb.build.add_tasks(tasklist, deltasklist, d) |
335 | 335 | ||
336 | bb.parse.siggen.finalise(fn, d, variant) | 336 | bb.parse.siggen.finalise(fn, d, variant) |