From 798415bd21a73ab7ec3c6ea107b3f3ea81a824aa Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Jul 2012 11:35:11 +0000 Subject: 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 --- bitbake/lib/bb/data.py | 2 ++ bitbake/lib/bb/parse/ast.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index e3ffefeb36..5b7a092a21 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 eae840fa8d..86f94636b9 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): -- cgit v1.2.3-54-g00ecf