diff options
Diffstat (limited to 'lib/bb/data.py')
| -rw-r--r-- | lib/bb/data.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index bcb8b055b..10188f380 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -49,6 +49,7 @@ from bb import data_smart from bb import codeparser import bb +logger = data_smart.logger _dict_type = data_smart.DataSmart def init(): @@ -258,7 +259,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): emit_var(key, o, d, False) and o.write('\n') emit_var(func, o, d, False) and o.write('\n') - newdeps = bb.codeparser.ShellParser(func).parse_shell(d.getVar(func, True)) + newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True)) seen = set() while newdeps: deps = newdeps @@ -267,7 +268,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): for dep in deps: if bb.data.getVarFlag(dep, "func", d): emit_var(dep, o, d, False) and o.write('\n') - newdeps |= bb.codeparser.ShellParser(dep).parse_shell(d.getVar(dep, True)) + newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep, True)) newdeps -= seen def update_data(d): @@ -276,25 +277,28 @@ def update_data(d): def build_dependencies(key, keys, shelldeps, d): deps = set() + vardeps = d.getVarFlag(key, "vardeps", True) try: if d.getVarFlag(key, "func"): if d.getVarFlag(key, "python"): parsedvar = d.expandWithRefs(d.getVar(key, False), key) - parser = bb.codeparser.PythonParser(key) + parser = bb.codeparser.PythonParser(key, logger) parser.parse_python(parsedvar.value) deps = deps | parser.references else: parsedvar = d.expandWithRefs(d.getVar(key, False), key) - parser = bb.codeparser.ShellParser(key) + parser = bb.codeparser.ShellParser(key, logger) parser.parse_shell(parsedvar.value) deps = deps | shelldeps + if vardeps is None: + parser.log.flush() deps = deps | parsedvar.references deps = deps | (keys & parser.execs) | (keys & parsedvar.execs) else: parser = d.expandWithRefs(d.getVar(key, False), key) deps |= parser.references deps = deps | (keys & parser.execs) - deps |= set((d.getVarFlag(key, "vardeps", True) or "").split()) + deps |= set((vardeps or "").split()) deps -= set((d.getVarFlag(key, "vardepsexclude", True) or "").split()) except: bb.note("Error expanding variable %s" % key) |