[Buildroot] [PATCH v3 1/3] utils/checkpackagelib: CommentsMenusPackagesOrder: fix 'menuconfig' handling
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Thu Aug 1 08:02:35 UTC 2019
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 at mind.be>
Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek at gmail.com>
---
v3: use Jerzy's approach of adding a space after all conditions, not
just menu.
v2: Jerzy independently did a similar change.
---
utils/checkpackagelib/lib_config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 7d7567ac67..b42760396e 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -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"):
--
2.21.0
More information about the buildroot
mailing list