diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-18 11:35:11 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 10:24:50 +0100 |
commit | 798415bd21a73ab7ec3c6ea107b3f3ea81a824aa (patch) | |
tree | 9f735c7b64119d3518688a91834e8710094cdbcc | |
parent | 6ab608087af5c09b58737db281ba4181790c033c (diff) | |
download | ast2050-yocto-poky-798415bd21a73ab7ec3c6ea107b3f3ea81a824aa.zip ast2050-yocto-poky-798415bd21a73ab7ec3c6ea107b3f3ea81a824aa.tar.gz |
bitbake: bitbake: Warn upon finding tab indentation in python functions
Mixed spacing in python functions can cause subtle issues and
generally confuses users. We've standardised on 4 space indentation,
adding this warning helps ensure consistency and avoid bugs. It
also makes _prepend and _append operations on python functions slightly
less risky.
(Bitbake rev: c51cfaf48d3b12a19b01e824b6ba4230376bcad4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/data.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index e3ffefe..5b7a092 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -291,6 +291,8 @@ def build_dependencies(key, keys, shelldeps, vardepvals, d): if d.getVarFlag(key, "python"): parsedvar = d.expandWithRefs(value, key) parser = bb.codeparser.PythonParser(key, logger) + if parsedvar.value and "\t" in parsedvar.value: + logger.warn("Variable %s contains tabs, please remove these (%s)" % (key, d.getVar("FILE", True))) parser.parse_python(parsedvar.value) deps = deps | parser.references else: diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index eae840f..86f9463 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -212,9 +212,9 @@ class ExportFuncsNode(AstNode): data.setVarFlag(calledvar, flag, data.getVarFlag(var, flag)) if data.getVarFlag(calledvar, "python"): - data.setVar(var, "\tbb.build.exec_func('" + calledvar + "', d)\n") + data.setVar(var, " bb.build.exec_func('" + calledvar + "', d)\n") else: - data.setVar(var, "\t" + calledvar + "\n") + data.setVar(var, " " + calledvar + "\n") data.setVarFlag(var, 'export_func', '1') class AddTaskNode(AstNode): |