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

Fix logic in check_binary_arches

Browse Source
This commit is contained in:
Carlo Cabrera 2021-07-20 12:35:09 +08:00
parent 7b74730f9d
commit 1678a3785e
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_cellar_checks.rb
View File

@ -323,14 +323,15 @@ module FormulaCellarChecks
mismatches = keg.binary_executable_or_library_files.reject do |file| mismatches = keg.binary_executable_or_library_files.reject do |file|
file.arch == Hardware::CPU.arch file.arch == Hardware::CPU.arch
end end
return if mismatches.empty?
compatible_universal_binaries = mismatches.select do |file| compatible_universal_binaries = mismatches.select do |file|
file.arch == :universal && file.archs.include?(Hardware::CPU.arch) file.arch == :universal && file.archs.include?(Hardware::CPU.arch)
end end
mismatches -= compatible_universal_binaries mismatches -= compatible_universal_binaries
return if mismatches.empty? && compatible_universal_binaries.empty? universal_binaries_expected = tap_audit_exception(:universal_binary_allowlist, formula.name)
return if mismatches.empty? && tap_audit_exception(:universal_binary_allowlist, formula.name) return if mismatches.empty? && universal_binaries_expected
s = "" s = ""
@ -342,7 +343,7 @@ module FormulaCellarChecks
EOS EOS
end end
unless compatible_universal_binaries.empty? if !compatible_universal_binaries.empty? && !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: