diff options
| -rw-r--r-- | lib/bb/build.py | 2 | ||||
| -rw-r--r-- | lib/bb/cooker.py | 2 | ||||
| -rw-r--r-- | lib/bb/data.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/bb/build.py b/lib/bb/build.py index f16675bde..1cd546a71 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -239,7 +239,7 @@ def exec_func_python(func, d, runfile, cwd=None): """Execute a python BB 'function'""" bbfile = d.getVar('FILE', True) - code = _functionfmt.format(function=func, body=d.getVar(func, True)) + code = _functionfmt.format(function=func, body=d.getVar(func, False)) bb.utils.mkdirhier(os.path.dirname(runfile)) with open(runfile, 'w') as script: bb.data.emit_func_python(func, script, d) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index d990b0587..af3d77b3a 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -653,7 +653,7 @@ class BBCooker: data.expandKeys(envdata) for e in envdata.keys(): if data.getVarFlag( e, 'python', envdata ): - logger.plain("\npython %s () {\n%s}\n", e, envdata.getVar(e, True)) + logger.plain("\npython %s () {\n%s}\n", e, envdata.getVar(e, False)) def buildTaskData(self, pkgs_to_build, task, abort, allowincomplete=False): diff --git a/lib/bb/data.py b/lib/bb/data.py index 137ed4e3e..dbc6dea68 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -298,7 +298,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()): """Emits all items in the data store in a format such that it can be sourced by a shell.""" def write_func(func, o, call = False): - body = d.getVar(func, True) + body = d.getVar(func, False) if not body.startswith("def"): body = _functionfmt.format(function=func, body=body) @@ -308,7 +308,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()): write_func(func, o, True) pp = bb.codeparser.PythonParser(func, logger) - pp.parse_python(d.getVar(func, True)) + pp.parse_python(d.getVar(func, False)) newdeps = pp.execs newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) seen = set() @@ -320,7 +320,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()): if d.getVarFlag(dep, "func", False) and d.getVarFlag(dep, "python", False): write_func(dep, o) pp = bb.codeparser.PythonParser(dep, logger) - pp.parse_python(d.getVar(dep, True)) + pp.parse_python(d.getVar(dep, False)) newdeps |= pp.execs newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split()) newdeps -= seen |