浏览代码

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 <jerzy.m.grzegorek@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Jerzy Grzegorek 6 年之前
父节点
当前提交
83a34f7705
共有 1 个文件被更改,包括 12 次插入6 次删除
  1. 12 6
      utils/checkpackagelib/lib_config.py

+ 12 - 6
utils/checkpackagelib/lib_config.py

@@ -61,9 +61,9 @@ class AttributesOrder(_CheckFunction):
 
 
 
 
 class CommentsMenusPackagesOrder(_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):
     def before(self):
         self.state = ""
         self.state = ""
@@ -92,9 +92,15 @@ class CommentsMenusPackagesOrder(_CheckFunction):
                     self.state += "-menu"
                     self.state += "-menu"
 
 
             level = self.get_level()
             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"):
         elif text.startswith("endif") or text.startswith("endmenu"):
             if self.state.endswith("comment"):
             if self.state.endswith("comment"):