diff options
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index cff0d2b453..933a06e9bf 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -83,7 +83,7 @@ class DataNode(AstNode): | |||
83 | 83 | ||
84 | def getFunc(self, key, data): | 84 | def getFunc(self, key, data): |
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'], expand=False, noweakdefault=True) |
87 | else: | 87 | else: |
88 | return data.getVar(key, False, noweakdefault=True, parsing=True) | 88 | return data.getVar(key, False, noweakdefault=True, parsing=True) |
89 | 89 | ||
@@ -213,7 +213,7 @@ class ExportFuncsNode(AstNode): | |||
213 | for func in self.n: | 213 | for func in self.n: |
214 | calledfunc = self.classname + "_" + func | 214 | calledfunc = self.classname + "_" + func |
215 | 215 | ||
216 | if data.getVar(func, False) and not data.getVarFlag(func, 'export_func'): | 216 | if data.getVar(func, False) and not data.getVarFlag(func, 'export_func', False): |
217 | continue | 217 | continue |
218 | 218 | ||
219 | if data.getVar(func, False): | 219 | if data.getVar(func, False): |
@@ -221,15 +221,15 @@ class ExportFuncsNode(AstNode): | |||
221 | data.setVarFlag(func, 'func', None) | 221 | data.setVarFlag(func, 'func', None) |
222 | 222 | ||
223 | for flag in [ "func", "python" ]: | 223 | for flag in [ "func", "python" ]: |
224 | if data.getVarFlag(calledfunc, flag): | 224 | if data.getVarFlag(calledfunc, flag, False): |
225 | data.setVarFlag(func, flag, data.getVarFlag(calledfunc, flag)) | 225 | data.setVarFlag(func, flag, data.getVarFlag(calledfunc, flag, False)) |
226 | for flag in [ "dirs" ]: | 226 | for flag in [ "dirs" ]: |
227 | if data.getVarFlag(func, flag): | 227 | if data.getVarFlag(func, flag, False): |
228 | data.setVarFlag(calledfunc, flag, data.getVarFlag(func, flag)) | 228 | data.setVarFlag(calledfunc, flag, data.getVarFlag(func, flag, False)) |
229 | data.setVarFlag(func, "filename", "autogenerated") | 229 | data.setVarFlag(func, "filename", "autogenerated") |
230 | data.setVarFlag(func, "lineno", 1) | 230 | data.setVarFlag(func, "lineno", 1) |
231 | 231 | ||
232 | if data.getVarFlag(calledfunc, "python"): | 232 | if data.getVarFlag(calledfunc, "python", False): |
233 | data.setVar(func, " bb.build.exec_func('" + calledfunc + "', d)\n", parsing=True) | 233 | data.setVar(func, " bb.build.exec_func('" + calledfunc + "', d)\n", parsing=True) |
234 | else: | 234 | else: |
235 | if "-" in self.classname: | 235 | if "-" in self.classname: |