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

Revert "remove on_os from formula"

Browse Source 
This is causing `post_install` failures. Spotted in
Homebrew/homebrew-core#91763.

This reverts commit fc7462acd5ffb7cc393d2b56b989e96112ade896.
This commit is contained in:
Carlo Cabrera 2021-12-21 20:43:57 +08:00
parent c68c49cb0a
commit 504dfa8494
No known key found for this signature in database
GPG Key ID: C74D447FC549A1D0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formula.rb
View File

@ -64,6 +64,7 @@ class Formula
include Utils::Shebang include Utils::Shebang
include Utils::Shell include Utils::Shell
include Context include Context
include OnOS # TODO: 3.3.0: deprecate OnOS usage in instance methods.
extend Enumerable extend Enumerable
extend Forwardable extend Forwardable
extend Cachable extend Cachable
@ -3064,7 +3065,7 @@ class Formula
block ||= case only_if block ||= case only_if
when :clt_installed when :clt_installed
lambda do |_| lambda do |_|
if OS.mac? || Homebrew::EnvConfig.simulate_macos_on_linux? on_macos do
T.cast(self, PourBottleCheck).reason(+<<~EOS) T.cast(self, PourBottleCheck).reason(+<<~EOS)
The bottle needs the Apple Command Line Tools to be installed. The bottle needs the Apple Command Line Tools to be installed.
You can install them, if desired, with: You can install them, if desired, with:

16
Library/Homebrew/test/formula_spec.rb
View File

@ -1542,8 +1542,12 @@ describe Formula do
attr_reader :test attr_reader :test
def install def install
@test = 1 if OS.mac? || Homebrew::EnvConfig.simulate_macos_on_linux? on_macos do
@test = 2 if OS.linux? @test = 1
end
on_linux do
@test = 2
end
end end
end.new end.new
end end
@ -1561,8 +1565,12 @@ describe Formula do
attr_reader :test attr_reader :test
def install def install
@test = 1 if OS.mac? || Homebrew::EnvConfig.simulate_macos_on_linux? on_macos do
@test = 2 if OS.linux? @test = 1
end
on_linux do
@test = 2
end
end end
end.new end.new
end end