commit fd559f89b51de8289109782d57d54f4a1dcc5070
author Wei Li <weiwli@google.com> Fri Apr 07 21:35:13 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 07 21:35:13 2023 +0000
tree 619e22788c4b13455b22c6fb8b0ee7b2b72fe988
parent f049389e2e9d2ae378cf5efdb689abe86ffb3adf

Revert "Check if an installed file exists and report error if not."

This reverts commit f049389e2e9d2ae378cf5efdb689abe86ffb3adf.

Reason for revert: the check includes more files that should not be excluded.

Change-Id: I7f7d260218826cc8fd033400b2cfaf40e4c280d0

tools/generate-sbom.py

diff --git a/tools/generate-sbom.py b/tools/generate-sbom.py
index c22175c..eae7945 100755
--- a/tools/generate-sbom.py
+++ b/tools/generate-sbom.py
@@ -87,7 +87,6 @@
 ISSUE_NO_METADATA_FILE = 'No METADATA file found for installed file:'
 ISSUE_METADATA_FILE_INCOMPLETE = 'METADATA file incomplete:'
 ISSUE_UNKNOWN_SECURITY_TAG_TYPE = 'Unknown security tag type:'
-ISSUE_INSTALLED_FILE_NOT_EXIST = 'Non-exist installed files:'
 INFO_METADATA_FOUND_FOR_PACKAGE = 'METADATA file found for packages:'
 
 
@@ -598,12 +597,11 @@
 
   # Report on some issues and information
   report = {
-    ISSUE_NO_METADATA: [],
-    ISSUE_NO_METADATA_FILE: [],
-    ISSUE_METADATA_FILE_INCOMPLETE: [],
-    ISSUE_UNKNOWN_SECURITY_TAG_TYPE: [],
-    ISSUE_INSTALLED_FILE_NOT_EXIST: [],
-    INFO_METADATA_FOUND_FOR_PACKAGE: [],
+      ISSUE_NO_METADATA: [],
+      ISSUE_NO_METADATA_FILE: [],
+      ISSUE_METADATA_FILE_INCOMPLETE: [],
+      ISSUE_UNKNOWN_SECURITY_TAG_TYPE: [],
+      INFO_METADATA_FOUND_FOR_PACKAGE: []
   }
 
   # Scan the metadata in CSV file and create the corresponding package and file records in SPDX
@@ -621,9 +619,6 @@
 
       if not installed_file_has_metadata(installed_file_metadata, report):
         continue
-      if not os.path.isfile(installed_file):
-        report[ISSUE_INSTALLED_FILE_NOT_EXIST].append(installed_file)
-        continue
 
       file_id = new_file_id(installed_file)
       product_files.append(new_file_record(file_id, installed_file, checksum(installed_file)))