fix(model): Fix-up filtering excluded issues

This fixes the logic introduced by 6a84fa2. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · May 16, 2024 · b051095 · b051095
1 parent 62f008b
commit b051095
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/model/src/main/kotlin/OrtResult.kt b/model/src/main/kotlin/OrtResult.kt
@@ -329,7 +329,7 @@ data class OrtResult(
             val filteredIssues = issues.filterTo(mutableSetOf()) {
                 (!omitResolved || !isResolved(it))
                     && it.severity >= minSeverity
-                    && it !in issuesWithExcludedAffectedPathById[id].orEmpty()
+                    && (!omitExcluded || it !in issuesWithExcludedAffectedPathById[id].orEmpty())
             }
 
             filteredIssues.takeUnless { it.isEmpty() }?.let { id to it }

diff --git a/...s/reporters/static-html/src/funTest/assets/static-html-reporter-test-expected-output.html b/...s/reporters/static-html/src/funTest/assets/static-html-reporter-test-expected-output.html
@@ -1048,6 +1048,12 @@ <h3>Packages</h3>
                                     Resolved by: CANT_FIX_ISSUE - Resolved for illustration.</p>
                               </td>
                            </tr>
+                           <tr class="excluded">
+                              <td>
+                                 <p>2024-04-22T10:36:10.661544294Z [ERROR]: FakeScanner - ERROR: Timeout after 300 seconds
+                                    while scanning file 'analyzer/src/funTest/assets/projects/synthetic/gradle/lib/excluded-file.dat'.</p>
+                              </td>
+                           </tr>
                         </table>
                      </td>
                   </tr>