summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/bitbake-worker2
-rw-r--r--bitbake/lib/bb/build.py6
-rw-r--r--bitbake/lib/bb/cache.py2
-rw-r--r--bitbake/lib/bb/cookerdata.py2
-rw-r--r--bitbake/lib/bb/data.py8
-rw-r--r--bitbake/lib/bb/data_smart.py4
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py4
-rw-r--r--bitbake/lib/bb/parse/ast.py2
-rw-r--r--bitbake/lib/bb/tests/parse.py2
9 files changed, 16 insertions, 16 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker
index 8d043946cb..10de54c9c3 100755
--- a/bitbake/bin/bitbake-worker
+++ b/bitbake/bin/bitbake-worker
@@ -243,7 +243,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append
243 the_data.setVar(e, fakeenv[e]) 243 the_data.setVar(e, fakeenv[e])
244 the_data.setVarFlag(e, 'export', "1") 244 the_data.setVarFlag(e, 'export', "1")
245 245
246 task_exports = the_data.getVarFlag(taskname, 'exports', True) 246 task_exports = the_data.getVarFlag(taskname, 'exports')
247 if task_exports: 247 if task_exports:
248 for e in task_exports.split(): 248 for e in task_exports.split():
249 the_data.setVarFlag(e, 'export', '1') 249 the_data.setVarFlag(e, 'export', '1')
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index bdd83cd955..7a7aabb853 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -377,7 +377,7 @@ exit $ret
377 else: 377 else:
378 logfile = sys.stdout 378 logfile = sys.stdout
379 379
380 progress = d.getVarFlag(func, 'progress', True) 380 progress = d.getVarFlag(func, 'progress')
381 if progress: 381 if progress:
382 if progress == 'percent': 382 if progress == 'percent':
383 # Use default regex 383 # Use default regex
@@ -669,7 +669,7 @@ def stamp_internal(taskname, d, file_name, baseonly=False, noextra=False):
669 else: 669 else:
670 stamp = d.getVar('STAMP') 670 stamp = d.getVar('STAMP')
671 file_name = d.getVar('BB_FILENAME') 671 file_name = d.getVar('BB_FILENAME')
672 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" 672 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info') or ""
673 673
674 if baseonly: 674 if baseonly:
675 return stamp 675 return stamp
@@ -705,7 +705,7 @@ def stamp_cleanmask_internal(taskname, d, file_name):
705 else: 705 else:
706 stamp = d.getVar('STAMPCLEAN') 706 stamp = d.getVar('STAMPCLEAN')
707 file_name = d.getVar('BB_FILENAME') 707 file_name = d.getVar('BB_FILENAME')
708 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or "" 708 extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info') or ""
709 709
710 if not stamp: 710 if not stamp:
711 return [] 711 return []
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 131abbb1f8..c04ac13735 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -71,7 +71,7 @@ class RecipeInfoCommon(object):
71 71
72 @classmethod 72 @classmethod
73 def flaglist(cls, flag, varlist, metadata, squash=False): 73 def flaglist(cls, flag, varlist, metadata, squash=False):
74 out_dict = dict((var, metadata.getVarFlag(var, flag, True)) 74 out_dict = dict((var, metadata.getVarFlag(var, flag))
75 for var in varlist) 75 for var in varlist)
76 if squash: 76 if squash:
77 return dict((k,v) for (k,v) in out_dict.items() if v) 77 return dict((k,v) for (k,v) in out_dict.items() if v)
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 680f79a3ec..320bb5906c 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -369,7 +369,7 @@ class CookerDataBuilder(object):
369 parselog.critical("Undefined event handler function '%s'" % var) 369 parselog.critical("Undefined event handler function '%s'" % var)
370 sys.exit(1) 370 sys.exit(1)
371 handlerln = int(data.getVarFlag(var, "lineno", False)) 371 handlerln = int(data.getVarFlag(var, "lineno", False))
372 bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask", True) or "").split(), handlerfn, handlerln) 372 bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln)
373 373
374 data.setVar('BBINCLUDED',bb.parse.get_file_depends(data)) 374 data.setVar('BBINCLUDED',bb.parse.get_file_depends(data))
375 375
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 02a1140d0f..0f05b609e0 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -226,7 +226,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
226 o.write('\n') 226 o.write('\n')
227 emit_var(func, o, d, False) and o.write('\n') 227 emit_var(func, o, d, False) and o.write('\n')
228 newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) 228 newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func))
229 newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) 229 newdeps |= set((d.getVarFlag(func, "vardeps") or "").split())
230 seen = set() 230 seen = set()
231 while newdeps: 231 while newdeps:
232 deps = newdeps 232 deps = newdeps
@@ -236,7 +236,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
236 if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False): 236 if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False):
237 emit_var(dep, o, d, False) and o.write('\n') 237 emit_var(dep, o, d, False) and o.write('\n')
238 newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep)) 238 newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep))
239 newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split()) 239 newdeps |= set((d.getVarFlag(dep, "vardeps") or "").split())
240 newdeps -= seen 240 newdeps -= seen
241 241
242_functionfmt = """ 242_functionfmt = """
@@ -259,7 +259,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()):
259 pp = bb.codeparser.PythonParser(func, logger) 259 pp = bb.codeparser.PythonParser(func, logger)
260 pp.parse_python(d.getVar(func, False)) 260 pp.parse_python(d.getVar(func, False))
261 newdeps = pp.execs 261 newdeps = pp.execs
262 newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) 262 newdeps |= set((d.getVarFlag(func, "vardeps") or "").split())
263 seen = set() 263 seen = set()
264 while newdeps: 264 while newdeps:
265 deps = newdeps 265 deps = newdeps
@@ -271,7 +271,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()):
271 pp = bb.codeparser.PythonParser(dep, logger) 271 pp = bb.codeparser.PythonParser(dep, logger)
272 pp.parse_python(d.getVar(dep, False)) 272 pp.parse_python(d.getVar(dep, False))
273 newdeps |= pp.execs 273 newdeps |= pp.execs
274 newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split()) 274 newdeps |= set((d.getVarFlag(dep, "vardeps") or "").split())
275 newdeps -= seen 275 newdeps -= seen
276 276
277def update_data(d): 277def update_data(d):
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 482399a95d..be43eb9be3 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -108,7 +108,7 @@ class VariableParse:
108 varparse = self.d.expand_cache[key] 108 varparse = self.d.expand_cache[key]
109 var = varparse.value 109 var = varparse.value
110 else: 110 else:
111 var = self.d.getVarFlag(key, "_content", True) 111 var = self.d.getVarFlag(key, "_content")
112 self.references.add(key) 112 self.references.add(key)
113 if var is not None: 113 if var is not None:
114 return var 114 return var
@@ -122,7 +122,7 @@ class VariableParse:
122 parser = bb.codeparser.PythonParser(self.varname, logger) 122 parser = bb.codeparser.PythonParser(self.varname, logger)
123 parser.parse_python(code) 123 parser.parse_python(code)
124 if self.varname: 124 if self.varname:
125 vardeps = self.d.getVarFlag(self.varname, "vardeps", True) 125 vardeps = self.d.getVarFlag(self.varname, "vardeps")
126 if vardeps is None: 126 if vardeps is None:
127 parser.log.flush() 127 parser.log.flush()
128 else: 128 else:
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index ced43630ea..2bb41a4a94 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1180,13 +1180,13 @@ class FetchData(object):
1180 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: 1180 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
1181 self.md5_expected = None 1181 self.md5_expected = None
1182 else: 1182 else:
1183 self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name, True) 1183 self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name)
1184 if self.sha256_name in self.parm: 1184 if self.sha256_name in self.parm:
1185 self.sha256_expected = self.parm[self.sha256_name] 1185 self.sha256_expected = self.parm[self.sha256_name]
1186 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: 1186 elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
1187 self.sha256_expected = None 1187 self.sha256_expected = None
1188 else: 1188 else:
1189 self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name, True) 1189 self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name)
1190 self.ignore_checksums = False 1190 self.ignore_checksums = False
1191 1191
1192 self.names = self.parm.get("name",'default').split(',') 1192 self.names = self.parm.get("name",'default').split(',')
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index a3990e5b3e..7020940df9 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -347,7 +347,7 @@ def finalize(fn, d, variant = None):
347 if not handlerfn: 347 if not handlerfn:
348 bb.fatal("Undefined event handler function '%s'" % var) 348 bb.fatal("Undefined event handler function '%s'" % var)
349 handlerln = int(d.getVarFlag(var, "lineno", False)) 349 handlerln = int(d.getVarFlag(var, "lineno", False))
350 bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask", True) or "").split(), handlerfn, handlerln) 350 bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln)
351 351
352 bb.event.fire(bb.event.RecipePreFinalise(fn), d) 352 bb.event.fire(bb.event.RecipePreFinalise(fn), d)
353 353
diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py
index 86e86ed711..ab6ca90317 100644
--- a/bitbake/lib/bb/tests/parse.py
+++ b/bitbake/lib/bb/tests/parse.py
@@ -81,7 +81,7 @@ unset B[flag]
81 f = self.parsehelper(self.unsettest) 81 f = self.parsehelper(self.unsettest)
82 d = bb.parse.handle(f.name, self.d)[''] 82 d = bb.parse.handle(f.name, self.d)['']
83 self.assertEqual(d.getVar("A"), None) 83 self.assertEqual(d.getVar("A"), None)
84 self.assertEqual(d.getVarFlag("A","flag", True), None) 84 self.assertEqual(d.getVarFlag("A","flag"), None)
85 self.assertEqual(d.getVar("B"), "2") 85 self.assertEqual(d.getVar("B"), "2")
86 86
87 87