BBHandler: prompt error when task name contain expression
PATCH 1/1 BBHandler: prompt error when task name contain expression
From: Lee Chee Yang <[email protected]>
Task name contain expresion (eg, do_foo_remove_bar) can cause fatal error.
Check for naming before addtask. Prompt with understandable error message when expression found in task name.
[YOCTO #8805]
--- lib/bb/parse/parse_py/BBHandler.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
lib/bb/parse/parse_py/BBHandler.py +5 -1
@@ -13,7 +13,7 @@ # import re, bb, os -import bb.build, bb.utils +import bb.build, bb.utils, bb.data_smart from . import ConfHandler from .. import resolve_file, ast, logger, ParseError
@@ -233,6 +233,10 @@ def feeder(lineno, s, fn, root, statements, eof=False): if taskexpression.count(word) > 1: logger.warning("addtask contained multiple '%s' keywords, only one is supported" % word) + # Check and warn for having task with exprssion as part of task name + for te in taskexpression: + if any( ( "%s_" % keyword ) in te for keyword in bb.data_smart.__setvar_keyword__ ): + raise ParseError("Task name '%s' contain expression keyword, this is confusing the parser.\nAvoid using these expression keyword in task name.\n%s" % (te, ("\n".join(map(str, bb.data_smart.__setvar_keyword__)))), fn) ast.handleAddTask(statements, fn, lineno, m) return
Signature · 1 line
2.17.1
Quoted 6 lines
-----Original Message-----
From: [email protected] <bitbake- [email protected]> On Behalf Of Lee Chee Yang
Sent: den 5 november 2020 01:59
To: [email protected]
Subject: [bitbake-devel] [PATCH] BBHandler: prompt error when task name contain expression
Change "contain" to "contains".
Quoted 4 lines
From: Lee Chee Yang <[email protected]>
Task name contain expresion (eg,
do_foo_remove_bar) can cause fatal
Change "Task name contain expresion" to "A task name that contains an expression", and "fatal" to "a fatal".
Quoted 30 lines
error.
Check for naming before addtask. Prompt with understandable error message when expression found in task name.
[YOCTO #8805]
Signed-off-by Lee Chee Yang <[email protected]>--- lib/bb/parse/parse_py/BBHandler.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)lib/bb/parse/parse_py/BBHandler.py +1
-1@@ -13,7 +13,7 @@ # import re, bb, os -import bb.build, bb.utils +import bb.build, bb.utils, bb.data_smart from . import ConfHandler from .. import resolve_file, ast, logger, ParseError@@ -233,6 +233,10 @@ def feeder(lineno, s, fn, root, statements,eof=False):
iftaskexpression.count(word)> 1:
logger.warning("addtask contained multiple '%s' keywords, only one is supported" % word)
Quoted 1 line
+ # Check and warn for having task with exprssion as part of task name
Change "exprssion" to "expression".
lib/bb/parse/parse_py/BBHandler.py def feeder(lineno, s, fn, root, statements, eof=False): · line 239
Quoted 3 lines
lib/bb/parse/parse_py/BBHandler.py +3
-0+ for te in taskexpression: + if any( ( "%s_" % keyword ) in te for keyword in bb.data_smart.__setvar_keyword__ ): + raise ParseError("Task name '%s' contain expression keyword, this is confusing the parser.\nAvoid using these expression keyword in task name.\n%s" % (te, ("\n".join(map(str, bb.data_smart.__setvar_keyword__)))), fn)
Change "contain" to "contains an" and "keyword in task name." to "keywords in task names:".
Quoted 5 lines
ast.handleAddTask(statements, fn, lineno, m)return--
2.17.1
//Peter