Merge pull request #15562 from Bo98/caveat-on_os-fix

formula: fix variations not being generated for instance on_os usage
This commit is contained in:
Mike McQuaid 2023-06-19 13:33:49 +01:00 committed by GitHub
commit 1db2664d8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2253,7 +2253,7 @@ class Formula
os_versions = [*MacOSVersion::SYMBOLS.keys, :linux] os_versions = [*MacOSVersion::SYMBOLS.keys, :linux]
if path.exist? && self.class.on_system_blocks_exist? if path.exist? && (self.class.on_system_blocks_exist? || @on_system_blocks_exist)
formula_contents = path.read formula_contents = path.read
os_versions.product(OnSystem::ARCH_OPTIONS).each do |os, arch| os_versions.product(OnSystem::ARCH_OPTIONS).each do |os, arch|
bottle_tag = Utils::Bottles::Tag.new(system: os, arch: arch) bottle_tag = Utils::Bottles::Tag.new(system: os, arch: arch)