deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

utils/checkpackagelib: CommentsMenusPackagesOrder: fix 'menuconfig' handling

Browse source 
The CommentsMenusPackagesOrder check builds the 'state' to track the
depth of menus and conditions. However, a menuconfig doesn't create a
menu by itself - it is always followed by a condition that implies the
menu. As a result, when unwinding the 'state', the level will be wrong.

Fix this by checking for menu followed by a space, so it no longer
matches menuconfig. For consistency, do the same for comment and if
as well.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind) 2019-08-01 10:02:35 +02:00 committed by Thomas Petazzoni
parent f0453de25d
commit c62a282920
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/checkpackagelib/lib_config.py
View file

@ -77,8 +77,8 @@ class CommentsMenusPackagesOrder(_CheckFunction):
"package/Config.in.host"]:
return
if text.startswith("comment") or text.startswith("if") or \
text.startswith("menu"):
if text.startswith("comment ") or text.startswith("if ") or \
text.startswith("menu "):
if text.startswith("comment"):
if not self.state.endswith("-comment"):