Merge pull request #17596 from Homebrew/audit_min_os-arch-specific

This commit is contained in:
Mike McQuaid 2024-06-30 19:32:34 +01:00 committed by GitHub
commit 6ca46550d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -673,9 +673,12 @@ module Cask
end end
odebug "Declared minimum OS version: #{cask_min_os&.to_sym}" odebug "Declared minimum OS version: #{cask_min_os&.to_sym}"
return if cask_min_os&.to_sym == min_os.to_sym return if cask_min_os&.to_sym == min_os.to_sym
return if cask.on_system_blocks_exist? &&
OnSystem.arch_condition_met?(:arm) &&
cask_min_os < MacOSVersion.new("11")
min_os_definition = if cask_min_os.present? min_os_definition = if cask_min_os.present?
if cask.on_system_blocks_exist? if cask.on_system_blocks_exist? && cask.on_system_block_min_os.present?
"a block with a minimum OS version of #{cask.on_system_block_min_os.inspect}" "a block with a minimum OS version of #{cask.on_system_block_min_os.inspect}"
else else
cask_min_os.to_sym.inspect cask_min_os.to_sym.inspect