From 83a34f77051db6980aea277a8ab8e467f68f495a Mon Sep 17 00:00:00 2001 From: Jerzy Grzegorek Date: Thu, 1 Aug 2019 10:02:36 +0200 Subject: [PATCH] utils/checkpackagelib: CommentsMenusPackagesOrder: append elements to arrays if needed In the future, the nesting level of menus, comments and conditions may increase. The fixed array length used now is not appropriate. Therefore, append elements to the arrays if needed. Also change order of variables. Signed-off-by: Jerzy Grzegorek Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- utils/checkpackagelib/lib_config.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/utils/checkpackagelib/lib_config.py b/utils/checkpackagelib/lib_config.py index b42760396e..6cbdc209c8 100644 --- a/utils/checkpackagelib/lib_config.py +++ b/utils/checkpackagelib/lib_config.py @@ -61,9 +61,9 @@ class AttributesOrder(_CheckFunction): class CommentsMenusPackagesOrder(_CheckFunction): - print_package_warning = [True, True, True, True, True, True] - menu_of_packages = ["", "", "", "", "", ""] - package = ["", "", "", "", "", ""] + menu_of_packages = [] + package = [] + print_package_warning = [] def before(self): self.state = "" @@ -92,9 +92,15 @@ class CommentsMenusPackagesOrder(_CheckFunction): self.state += "-menu" level = self.get_level() - self.package[level] = "" - self.print_package_warning[level] = True - self.menu_of_packages[level] = text[:-1] + + try: + self.menu_of_packages[level] = text[:-1] + self.package[level] = "" + self.print_package_warning[level] = True + except IndexError: + self.menu_of_packages.append(text[:-1]) + self.package.append("") + self.print_package_warning.append(True) elif text.startswith("endif") or text.startswith("endmenu"): if self.state.endswith("comment"): -- 2.30.2