From 6ac57237697b4ffff86f7c843b70a05996ba51bd Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 14 Nov 2018 17:46:41 +0800 Subject: bitbake: BBHandler: Fix __python_func_regexp__ for comment lines Fixed: - Add a comment in base.bbclass: def oe_import(d): import sys # Comment bbpath = d.getVar("BBPATH").split(":") [snip] Note, '# Comment' is started with '#', it is legal in python's syntax (though maybe not a good style), but bitbake reported errors: $ bitbake -p ERROR: ParseError at /path/to/base.bbclass:20: unparsed line: ' bbpath = d.getVar("BBPATH").split(":")' This error report would mislead people, the real problem is that '# Comment' is not supported, but it reports the next line, this may make it hard to debug the code are complicated. We can make __python_func_regexp__ handle '^#' to fix the problem, since it already can handle blank line "^$" in a python function, so it would be pretty safe to handle "^#" as well. (Bitbake rev: 79e62eef1c93f742bf71e9f25db57fdd2ffedd02) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index e5039e3bd1..01fc47e512 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -45,7 +45,7 @@ __addtask_regexp__ = re.compile("addtask\s+(?P\w+)\s*((before\s*(?P< __deltask_regexp__ = re.compile("deltask\s+(?P\w+)") __addhandler_regexp__ = re.compile( r"addhandler\s+(.+)" ) __def_regexp__ = re.compile( r"def\s+(\w+).*:" ) -__python_func_regexp__ = re.compile( r"(\s+.*)|(^$)" ) +__python_func_regexp__ = re.compile( r"(\s+.*)|(^$)|(^#)" ) __infunc__ = [] __inpython__ = False -- cgit v1.2.3-54-g00ecf