core: fix inline suppression

- allow '-' in id - rewrite filtering to allow multiple items to be mapped better to the workflow Closes #677 Signed-off-by: Konrad Weihmann <[email protected]>
priv-kweihmann · Jan 3, 2025 · 451ac2d · 451ac2d
1 parent a6950a7
commit 451ac2d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/oelint_adv/core.py b/oelint_adv/core.py
@@ -199,7 +199,7 @@ def group_run(group: List[Tuple],
     for item in stash.GetItemsFor(classifier=Comment.CLASSIFIER):
         for line in item.get_items():
             m = re.match(
-                r'^#\s+nooelint:\s+(?P<ids>[A-Za-z0-9\.,_ ]*)', line)
+                r'^#\s+nooelint:\s+(?P<ids>[A-Za-z0-9\.,_-]*)', line)
             if m:
                 if item.Origin not in inline_supp_map:  # pragma: no cover
                     inline_supp_map[item.Origin] = {}

diff --git a/tests/test_inlinesuppressions.py b/tests/test_inlinesuppressions.py
@@ -80,7 +80,7 @@ def test_inlinesuppressions_single_notmatching_old(self, input_):
                                     # nooelint: oelint.var.suggestedvar.BUGTRACKER,oelint.var.mandatoryvar.SUMMARY,oelint.var.bbclassextend
                                     INSANE_SKIP_${PN} = "foo"
                                     ''',
-                                 }
+                                 },
                              ],
                              )
     def test_inlinesuppressions_line_1(self, input_):
@@ -91,6 +91,23 @@ def test_inlinesuppressions_line_1(self, input_):
         self.check_for_id(self._create_args(input_),
                           'oelint.var.bbclassextend', 0)
 
+    @pytest.mark.parametrize('input_',
+                             [
+                                 {
+                                     'oelint adv-test.bb':
+                                     '''
+                                     # nooelint: oelint.var.badimagefeature.allow-empty-password,oelint.var.badimagefeature.allow-root-login,oelint.var.badimagefeature.empty-root-password
+                                     IMAGE_FEATURES:append = " \
+                                        allow-empty-password allow-root-login empty-root-password \
+                                     "
+                                     ''',
+                                 },
+                             ],
+                             )
+    def test_inlinesuppressions_line_2(self, input_):
+        self.check_for_id(self._create_args(input_),
+                          'oelint.var.badimagefeature', 0)
+
     @pytest.mark.parametrize('input_',
                              [
                                  {