[oe-commits] [bitbake] 01/05: bitbake: BBHandler: Fix addtask and deltask
git at git.openembedded.org
git at git.openembedded.org
Mon Apr 29 13:17:28 UTC 2019
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository bitbake.
commit d393f9a1643ae6ca9ff20001f4fc1c6136ebeb76
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Mon Apr 29 16:11:58 2019 +0800
bitbake: BBHandler: Fix addtask and deltask
The following commands are not supported, but they were ignored silently, that
may suprise users:
* addtask task1 task2
task2 is ignored
* addtask task1 before task2 before task3
Should be: addtask task1 before task2 task3
* addtask task1 after task2 after task3
Should be: addtask task1 after task2 task3
* deltask task1 task2
task2 is ignore
This patch can check and warn for them.
[YOCTO #13282]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/parse/parse_py/BBHandler.py | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py
index 9dba5f2..314e802 100644
--- a/lib/bb/parse/parse_py/BBHandler.py
+++ b/lib/bb/parse/parse_py/BBHandler.py
@@ -42,7 +42,7 @@ __func_start_regexp__ = re.compile(r"(((?P<py>python)|(?P<fr>fakeroot))\s*)*(
__inherit_regexp__ = re.compile(r"inherit\s+(.+)" )
__export_func_regexp__ = re.compile(r"EXPORT_FUNCTIONS\s+(.+)" )
__addtask_regexp__ = re.compile(r"addtask\s+(?P<func>\w+)\s*((before\s*(?P<before>((.*(?=after))|(.*))))|(after\s*(?P<after>((.*(?=before))|(.*)))))*")
-__deltask_regexp__ = re.compile(r"deltask\s+(?P<func>\w+)")
+__deltask_regexp__ = re.compile(r"deltask\s+(?P<func>\w+)(?P<ignores>.*)")
__addhandler_regexp__ = re.compile(r"addhandler\s+(.+)" )
__def_regexp__ = re.compile(r"def\s+(\w+).*:" )
__python_func_regexp__ = re.compile(r"(\s+.*)|(^$)|(^#)" )
@@ -236,11 +236,27 @@ def feeder(lineno, s, fn, root, statements, eof=False):
m = __addtask_regexp__.match(s)
if m:
+ if len(m.group().split()) == 2:
+ # Check and warn for "addtask task1 task2"
+ m2 = re.match(r"addtask\s+(?P<func>\w+)(?P<ignores>.*)", s)
+ if m2 and m2.group('ignores'):
+ logger.warning('addtask ignored: "%s"' % m2.group('ignores'))
+
+ # Check and warn for "addtask task1 before task2 before task3", the
+ # similar to "after"
+ taskexpression = s.split()
+ for word in ('before', 'after'):
+ if taskexpression.count(word) > 1:
+ logger.warning("addtask contained multiple '%s' keywords, only one is supported" % word)
+
ast.handleAddTask(statements, fn, lineno, m)
return
m = __deltask_regexp__.match(s)
if m:
+ # Check and warn "for deltask task1 task2"
+ if m.group('ignores'):
+ logger.warning('deltask ignored: "%s"' % m.group('ignores'))
ast.handleDelTask(statements, fn, lineno, m)
return
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list