[Buildroot] [PATCH v2 02/13] utils/checkpackagelib: CommentsMenusPackagesOrder: separate the lines support
Jerzy Grzegorek
jerzy.m.grzegorek at gmail.com
Sat Oct 5 12:22:16 UTC 2019
The lines 'comment...', 'if ...' and 'menu ...' will be handled without
sharing any code so lets separate their handling.
Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek at gmail.com>
Cc: Ricardo Martincoski <ricardo.martincoski at gmail.com>
Reviewed-by: Ricardo Martincoski <ricardo.martincoski at gmail.com>
---
utils/checkpackagelib/lib_config.py | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py
index 499660feb7..06c066c5ca 100644
--- a/utils/checkpackagelib/lib_config.py
+++ b/utils/checkpackagelib/lib_config.py
@@ -95,22 +95,22 @@ class CommentsMenusPackagesOrder(_CheckFunction):
source_line = re.match(r'^\s*source ".*/([^/]*)/Config.in(.host)?"', text)
- if text.startswith("comment ") or text.startswith("if ") or \
- text.startswith("menu "):
+ if text.startswith("comment "):
+ if not self.state.endswith("-comment"):
+ self.state += "-comment"
- if text.startswith("comment"):
- if not self.state.endswith("-comment"):
- self.state += "-comment"
+ self.initialize_level_elements(text)
+
+ elif text.startswith("if "):
+ self.state += "-if"
- elif text.startswith("if") or text.startswith("menu"):
- if text.startswith("if"):
- self.state += "-if"
+ self.initialize_level_elements(text)
- elif text.startswith("menu"):
- if self.state.endswith("-comment"):
- self.state = self.state[:-8]
+ elif text.startswith("menu "):
+ if self.state.endswith("-comment"):
+ self.state = self.state[:-8]
- self.state += "-menu"
+ self.state += "-menu"
self.initialize_level_elements(text)
--
2.17.1
More information about the buildroot
mailing list