Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bb86d05 authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

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

parents d8e23f95 fd559f89

tools/generate-sbom.py

+5 −10
Original line number Diff line number Diff line
@@ -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_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:'
@@ -602,8 +601,7 @@ def main(): 
      ISSUE_NO_METADATA_FILE: [],

      ISSUE_METADATA_FILE_INCOMPLETE: [],

      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
@@ -621,9 +619,6 @@ def main(): 


      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)))