utils/checkpackagelib: CommentsMenusPackagesOrder: change the type of variable 'new_p...
authorJerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
Tue, 3 Sep 2019 21:13:28 +0000 (23:13 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Wed, 25 Sep 2019 20:24:42 +0000 (22:24 +0200)
Change the type of variable 'new_package' to make it a class member.
It will be used not only locally. Also initialize it.

Signed-off-by: Jerzy Grzegorek <jerzy.m.grzegorek@gmail.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
utils/checkpackagelib/lib_config.py

index aaa31e4d7239a59747a7c9954d5968aadc3ed996..fc0df3dd173fb1152f65ddcce9b71dceab7b9ea6 100644 (file)
@@ -68,6 +68,7 @@ class CommentsMenusPackagesOrder(_CheckFunction):
     def before(self):
         self.state = ""
         self.level = 0
+        self.new_package = ""
 
     def get_level(self):
         return len(self.state.split('-')) - 1
@@ -123,10 +124,10 @@ class CommentsMenusPackagesOrder(_CheckFunction):
             self.level = self.get_level()
 
         elif source_line:
-            new_package = source_line.group(1)
+            self.new_package = source_line.group(1)
 
             # We order _ before A, so replace it with .
-            new_package_ord = new_package.replace('_', '.')
+            new_package_ord = self.new_package.replace('_', '.')
 
             if self.package[self.level] != "" and \
                self.print_package_warning[self.level] and \
@@ -140,7 +141,7 @@ class CommentsMenusPackagesOrder(_CheckFunction):
                         "{spaces}first incorrect package: {package}"
                         .format(prefix=prefix, spaces=spaces,
                                 menu=self.menu_of_packages[self.level],
-                                package=new_package),
+                                package=self.new_package),
                         text]
 
             self.package[self.level] = new_package_ord