Apply suggestions from code review

This commit is contained in:
Mike McQuaid 2024-05-26 15:28:53 +01:00 committed by GitHub
parent fdb347c35f
commit 7be26329c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -121,12 +121,12 @@ class SBOM
end
end
sig { params(bottling: T::Boolean).returns(T.nilable(T::Boolean)) }
sig { params(bottling: T::Boolean).returns(T::Boolean) }
def valid?(bottling: false)
unless require? "json_schemer"
error_message = "Need json_schemer to validate SBOM, run `brew install-bundler-gems --add-groups=bottle`!"
odie error_message if ENV["HOMEBREW_ENFORCE_SBOM"]
return nil
return true
end
schema = SBOM.fetch_schema!
@ -156,7 +156,7 @@ class SBOM
# will no longer be valid.
Formula.clear_cache unless spdxfile.exist?
if validate && (valid = valid?(bottling:)).present? && !valid
if validate && !valid?(bottling:)
opoo "SBOM is not valid, not writing to disk!"
return
end