StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I43b48c58deda34e371f9572504a2540db75ed671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Wei Li
2023-04-07 21:52:00 +00:00
committed by Automerger Merge Worker
parent a1c42f5b17 0bb86d0515
commit 3b488ddaac
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/generate-sbom.py
View File

@@ -87,7 +87,6 @@ ISSUE_NO_METADATA = 'No metadata generated in Make for installed files:'
ISSUE_NO_METADATA_FILE = 'No METADATA file found for installed file:' ISSUE_NO_METADATA_FILE = 'No METADATA file found for installed file:'
ISSUE_METADATA_FILE_INCOMPLETE = 'METADATA file incomplete:' ISSUE_METADATA_FILE_INCOMPLETE = 'METADATA file incomplete:'
ISSUE_UNKNOWN_SECURITY_TAG_TYPE = 'Unknown security tag type:' 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:' INFO_METADATA_FOUND_FOR_PACKAGE = 'METADATA file found for packages:'
@@ -602,8 +601,7 @@ def main():
ISSUE_NO_METADATA_FILE: [], ISSUE_NO_METADATA_FILE: [],
ISSUE_METADATA_FILE_INCOMPLETE: [], ISSUE_METADATA_FILE_INCOMPLETE: [],
ISSUE_UNKNOWN_SECURITY_TAG_TYPE: [], ISSUE_UNKNOWN_SECURITY_TAG_TYPE: [],
ISSUE_INSTALLED_FILE_NOT_EXIST: [], INFO_METADATA_FOUND_FOR_PACKAGE: []
INFO_METADATA_FOUND_FOR_PACKAGE: [],
} }
# Scan the metadata in CSV file and create the corresponding package and file records in SPDX # Scan the metadata in CSV file and create the corresponding package and file records in SPDX
@@ -621,9 +619,6 @@ def main():
if not installed_file_has_metadata(installed_file_metadata, report): if not installed_file_has_metadata(installed_file_metadata, report):
continue 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) file_id = new_file_id(installed_file)
product_files.append(new_file_record(file_id, installed_file, checksum(installed_file))) product_files.append(new_file_record(file_id, installed_file, checksum(installed_file)))