admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Enforce universal binary check only for Homebrew/core

Browse Source 
Also, prefer `if` to `unless`.
This commit is contained in:
Carlo Cabrera 2021-07-20 18:40:19 +08:00
parent 55cc1eb8b0
commit 239fd06728
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/formula_cellar_checks.rb
View File

@ -330,13 +330,15 @@ module FormulaCellarChecks
end end
mismatches -= compatible_universal_binaries mismatches -= compatible_universal_binaries
universal_binaries_expected = universal_binaries_expected = true
formula.tap.present? && tap_audit_exception(:universal_binary_allowlist, formula.name) universal_binaries_expected = if formula.tap.present? && formula.tap.core_tap?
tap_audit_exception(:universal_binary_allowlist, formula.name)
end
return if mismatches.empty? && universal_binaries_expected return if mismatches.empty? && universal_binaries_expected
s = "" s = ""
unless mismatches.empty? if mismatches.any?
s += <<~EOS s += <<~EOS
Binaries built for an incompatible architecture were installed into #{formula}'s prefix. Binaries built for an incompatible architecture were installed into #{formula}'s prefix.
The offending files are: The offending files are:
@ -344,7 +346,7 @@ module FormulaCellarChecks
EOS EOS
end end
if !compatible_universal_binaries.empty? && !universal_binaries_expected if compatible_universal_binaries.any? && !universal_binaries_expected
s += <<~EOS s += <<~EOS
Unexpected universal binaries were found. Unexpected universal binaries were found.
The offending files are: The offending files are: