Merge pull request #1395 from qha/permit-repeating-rpmlintrc

Permit repeating --rpmlintrc

Author: danigm

rpmlint/cli.py

@@ -75,7 +75,7 @@ def process_lint_args(argv):
     parser.add_argument('-V', '--version', action='version', version=__version__, help='show package version and exit')
     parser.add_argument('-c', '--config', type=_validate_conf_location, help='load up additional configuration data from specified path (file or directory with *.toml files)')
     parser.add_argument('-e', '--explain', nargs='+', default='', help='provide detailed explanation for one specific message id')
-    parser.add_argument('-r', '--rpmlintrc', '--file', type=_is_file_path, help='load up specified rpmlintrc file')
+    parser.add_argument('-r', '--rpmlintrc', '--file', action='append', type=_is_file_path, help='load up specified rpmlintrc file (may be repeated)')
     parser.add_argument('-v', '--verbose', '--info', action='store_true', help='provide detailed explanations where available')
     parser.add_argument('-p', '--print-config', action='store_true', help='print the settings that are in effect when using the rpmlint')
     parser.add_argument('-i', '--installed', nargs='+', default='', help='installed packages to be validated by rpmlint')
@@ -96,11 +96,7 @@ def process_lint_args(argv):
 
     options = parser.parse_args(args=argv)
 
-    # make sure rpmlintrc exists
-    if options.rpmlintrc and not options.rpmlintrc.exists():
-        print_warning(f"User specified rpmlintrc '{options.rpmlintrc}' does not exist")
-        sys.exit(2)
-    # validate all the rpmlfile options to be either file or folder
+    # validate all the rpmfile options to be either file or folder
     f_path = set()
     invalid_path = False
     for item in options.rpmfile:

rpmlint/lint.py

@@ -37,8 +37,6 @@ def __init__(self, options):
         else:
             self.profile = None
 
-        if options['rpmlintrc']:
-            options['rpmlintrc'] = [options['rpmlintrc']]
         self._load_rpmlintrc()
         if options['verbose']:
             self.config.info = options['verbose']
@@ -179,9 +177,6 @@ def _load_rpmlintrc(self):
         Load rpmlintrc from argument or load up from folder
         """
         if self.options['rpmlintrc']:
-            # Right now, we allow loading of just a single file, but the 'opensuse'
-            # branch contains auto-loading mechanism that can eventually load
-            # multiple files.
             for rcfile in self.options['rpmlintrc']:
                 self.config.load_rpmlintrc(rcfile)
         else:

test/test_lint.py

@@ -445,7 +445,7 @@ def test_run_rpmlintrc_multiple(capsys, packages):
 def test_run_rpmlintrc_single_file(capsys, packages):
     additional_options = {
         'rpmfile': [packages],
-        'rpmlintrc': TEST_RPMLINTRC
+        'rpmlintrc': [TEST_RPMLINTRC]
     }
     options = {**options_preset, **additional_options}
     linter = Lint(options)