diff options
Diffstat (limited to 'lib/bb/parse/ast.py')
| -rw-r--r-- | lib/bb/parse/ast.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index c53ab17d6..1130b1474 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -85,7 +85,7 @@ class DataNode(AstNode): if 'flag' in self.groupd and self.groupd['flag'] != None: return data.getVarFlag(key, self.groupd['flag'], noweakdefault=True) else: - return data.getVar(key, noweakdefault=True) + return data.getVar(key, False, noweakdefault=True) def eval(self, data): groupd = self.groupd @@ -152,7 +152,7 @@ class MethodNode(AstNode): funcname = ("__anon_%s_%s" % (self.lineno, self.filename.translate(MethodNode.tr_tbl))) text = "def %s(d):\n" % (funcname) + text bb.methodpool.insert_method(funcname, text, self.filename) - anonfuncs = data.getVar('__BBANONFUNCS') or [] + anonfuncs = data.getVar('__BBANONFUNCS', False) or [] anonfuncs.append(funcname) data.setVar('__BBANONFUNCS', anonfuncs) data.setVar(funcname, text) @@ -184,7 +184,7 @@ class MethodFlagsNode(AstNode): self.m = m def eval(self, data): - if data.getVar(self.key): + if data.getVar(self.key, False): # clean up old version of this piece of metadata, as its # flags could cause problems data.setVarFlag(self.key, 'python', None) @@ -209,10 +209,10 @@ class ExportFuncsNode(AstNode): for func in self.n: calledfunc = self.classname + "_" + func - if data.getVar(func) and not data.getVarFlag(func, 'export_func'): + if data.getVar(func, False) and not data.getVarFlag(func, 'export_func'): continue - if data.getVar(func): + if data.getVar(func, False): data.setVarFlag(func, 'python', None) data.setVarFlag(func, 'func', None) @@ -255,7 +255,7 @@ class BBHandlerNode(AstNode): self.hs = fns.split() def eval(self, data): - bbhands = data.getVar('__BBHANDLERS') or [] + bbhands = data.getVar('__BBHANDLERS', False) or [] for h in self.hs: bbhands.append(h) data.setVarFlag(h, "handler", 1) @@ -315,22 +315,22 @@ def handleInherit(statements, filename, lineno, m): def finalize(fn, d, variant = None): all_handlers = {} - for var in d.getVar('__BBHANDLERS') or []: + for var in d.getVar('__BBHANDLERS', False) or []: # try to add the handler - bb.event.register(var, d.getVar(var), (d.getVarFlag(var, "eventmask", True) or "").split()) + bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask", True) or "").split()) bb.event.fire(bb.event.RecipePreFinalise(fn), d) bb.data.expandKeys(d) bb.data.update_data(d) code = [] - for funcname in d.getVar("__BBANONFUNCS") or []: + for funcname in d.getVar("__BBANONFUNCS", False) or []: code.append("%s(d)" % funcname) bb.utils.better_exec("\n".join(code), {"d": d}) bb.data.update_data(d) - tasklist = d.getVar('__BBTASKS') or [] - deltasklist = d.getVar('__BBDELTASKS') or [] + tasklist = d.getVar('__BBTASKS', False) or [] + deltasklist = d.getVar('__BBDELTASKS', False) or [] bb.build.add_tasks(tasklist, deltasklist, d) bb.parse.siggen.finalise(fn, d, variant) |