Fix: reinstate exclude logic for checkers

alex-cheng-techman · alex-cheng-techman · commit 1c9c88f0645f · 2025-06-20T15:21:40.000+08:00
diff --git a/cve_bin_tool/util.py b/cve_bin_tool/util.py
@@ -534,14 +534,15 @@ def walk(self, roots: list[str] | None = None) -> Iterator[str]:
                             filenames.remove(filename)
                     except PermissionError:
                         filenames.remove(filename)
+                    
                 dirnames[:] = [
                     dirname
                     for dirname in dirnames
                     if self.pattern_match(
-                        str(Path(dirpath) / dirname), self.folder_include_pattern
+                        os.path.join(dirpath, dirname), self.folder_include_pattern
                     )
                     and not self.pattern_match(
-                        str(Path(dirpath) / dirname), self.folder_exclude_pattern
+                        os.path.join(dirpath, dirname), self.folder_exclude_pattern
                     )
                 ]
                 # Yields

Original file line number	Diff line number	Diff line change
`@@ -534,14 +534,15 @@ def walk(self, roots: list[str] \| None = None) -> Iterator[str]:`
`534`	`534`	`filenames.remove(filename)`
`535`	`535`	`except PermissionError:`
`536`	`536`	`filenames.remove(filename)`
	`537`	`+`
`537`	`538`	`dirnames[:] = [`
`538`	`539`	`dirname`
`539`	`540`	`for dirname in dirnames`
`540`	`541`	`if self.pattern_match(`
`541`		`- str(Path(dirpath) / dirname), self.folder_include_pattern`
	`542`	`+ os.path.join(dirpath, dirname), self.folder_include_pattern`
`542`	`543`	`)`
`543`	`544`	`and not self.pattern_match(`
`544`		`- str(Path(dirpath) / dirname), self.folder_exclude_pattern`
	`545`	`+ os.path.join(dirpath, dirname), self.folder_exclude_pattern`
`545`	`546`	`)`
`546`	`547`	`]`
`547`	`548`	`# Yields`