Merge branch 'main' into opensuse

Author: danigm

.packit/rpmlint.spec

@@ -1,7 +1,7 @@
 %{!?python3: %global python3 %{__python3}}
 
 Name:           rpmlint
-Version:        2.7.0
+Version:        2.8.0
 Release:        0%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rpmlint"
-version = "2.7.0"
+version = "2.8.0"
 description = "Check for common errors in RPM packages"
 license = {text = "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)"}
 authors = [

rpmlint/checks/AbstractCheck.py

@@ -50,9 +50,7 @@ def check_binary(self, pkg):
             # start with the biggest files first
             filenames = sorted(filenames, key=lambda x: pkg.files[x].size, reverse=True)
             with concurrent.futures.ThreadPoolExecutor() as executor:
-                futures = []
-                for filename in filenames:
-                    futures.append(executor.submit(self.check_file, pkg, filename))
+                futures = [executor.submit(self.check_file, pkg, filename) for filename in filenames]
                 concurrent.futures.wait(futures)
                 for future in futures:
                     err = future.exception()

rpmlint/checks/AlternativesCheck.py

@@ -22,7 +22,7 @@ class AlternativesCheck(AbstractCheck):
       Requires(post) and Requires(postun) must depend on update-alternatives
     """
     # Regex to match anything that can be in requires for update-alternatives
-    re_requirement = re.compile(r'^(/usr/sbin/|%{?_sbindir}?/)?update-alternatives$')
+    re_requirement = re.compile(r'^(/usr/s?bin/|%{?_s?bindir}?/)?update-alternatives$')
     re_install = re.compile(r'--install\s+(?P<link>\S+)\s+(?P<name>\S+)\s+(\S+)\s+(\S+)')
     re_slave = re.compile(r'--slave\s+(?P<link>\S+)\s+(\S+)\s+(\S+)')
     command = 'update-alternatives'

rpmlint/checks/I18NCheck.py

@@ -70,8 +70,7 @@ def is_valid_lang(lang):
 
 class I18NCheck(AbstractCheck):
     def check_binary(self, pkg):
-        files = list(pkg.files.keys())
-        files.sort()
+        files = sorted(pkg.files.keys())
         locales = []                      # list of locales for this packages
         webapp = False
 

rpmlint/checks/InitScriptCheck.py

@@ -42,8 +42,7 @@ def shell_var_value(var, script):
         if res2 and res2.group(2) == var:  # infinite loop
             return None
         return substitute_shell_vars(res.group(1), script)
-    else:
-        return None
+    return None
 
 
 def substitute_shell_vars(val, script):
@@ -54,8 +53,7 @@ def substitute_shell_vars(val, script):
             value = ''
         return res.group(1) + value + \
             substitute_shell_vars(res.group(3), script)
-    else:
-        return val
+    return val
 
 
 class InitScriptCheck(AbstractCheck):

rpmlint/checks/ZipCheck.py

@@ -78,7 +78,7 @@ def _check_classpath(self, pkg, fname, jarfile):
             return
 
         # otherwise check for the hardcoded classpath
-        manifest = jarfile.read(mf).decode()
+        manifest = jarfile.read(mf).decode(errors='replace')
         if classpath_regex.search(manifest):
             self.output.add_info('W', pkg, 'class-path-in-manifest', fname)
 

rpmlint/cli.py

@@ -101,7 +101,7 @@ def process_lint_args(argv):
     if options.rpmlintrc:
         if not options.rpmlintrc.exists():
             print_warning(f"User specified rpmlintrc '{options.rpmlintrc}' does not exist")
-            exit(2)
+            sys.exit(2)
         # make it a list
         options.rpmlintrc = [options.rpmlintrc]
     else:
@@ -126,7 +126,7 @@ def process_lint_args(argv):
         f_path.update(p_path)
 
     if invalid_path:
-        exit(2)
+        sys.exit(2)
     # convert options to dict
     options_dict = vars(options)
     # use computed rpmfile
@@ -155,7 +155,7 @@ def _validate_conf_location(string):
     if not path.exists():
         print_warning(
             f"File or dir with user specified configuration '{string}' does not exist")
-        exit(2)
+        sys.exit(2)
 
     if path.is_dir():
         config_paths.extend(path.glob('*.toml'))
@@ -180,8 +180,7 @@ def lint():
     # TODO: remove once OBS integration is done
     options = process_lint_args(sys.argv[1:] + ['--permissive'])
 
-    lint = Lint(options)
-    sys.exit(lint.run())
+    sys.exit(Lint(options).run())
 
 
 def diff():

rpmlint/config.py

@@ -123,10 +123,9 @@ def _sort_config_files(self, config_file):
         """
         if config_file == self.config_defaults:
             return 0
-        elif not self._is_override_config(config_file):
+        if not self._is_override_config(config_file):
             return 1
-        else:
-            return 2
+        return 2
 
     def load_config(self, config=None):
         """

rpmlint/lint.py

@@ -82,6 +82,7 @@ def _run(self):
         if self.options['explain']:
             self.print_explanation(self.options['explain'], self.config)
             return retcode
+
         # if there are installed arguments just load them up as extra
         # items to the rpmfile option
         if self.options['installed']:
@@ -240,8 +241,10 @@ def _print_header(self):
         print('')
 
     def validate_installed_packages(self, packages):
+        # Do not run post checks if there are also plain rpm/spec files to validate
+        run_post_checks = not bool(self.options['rpmfile'])
         for pkg in packages:
-            self.run_checks(pkg, pkg == packages[-1])
+            self.run_checks(pkg, run_post_checks and pkg == packages[-1])
             self.reset_checks()
 
     def validate_files(self, files):
@@ -275,7 +278,7 @@ def _expand_filelist(self, files):
 
     def validate_file(self, pname, is_last):
         try:
-            if pname.suffix == '.rpm' or pname.suffix == '.spm':
+            if pname.suffix in ('.rpm', '.spm'):
                 with Pkg(pname, self.config.configuration['ExtractDir'],
                          verbose=self.config.info) as pkg:
                     for k, v in pkg.timers.items():
@@ -288,8 +291,7 @@ def validate_file(self, pname, is_last):
             print_warning(f'(none): E: fatal error while reading {pname}: {e}')
             if self.config.info:
                 raise e
-            else:
-                sys.exit(3)
+            sys.exit(3)
 
     def run_checks(self, pkg, is_last):
         spec_checks = isinstance(pkg, FakePkg)