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

pour_bottle?: Fix when formula.bottle is nil

Browse Source 
formula.bottle is nil when bottle.compatible_cellar? is false.
Use formula.bottle_specification.compatible_cellar? rather
than formula.bottle.compatible_cellar?.
This commit is contained in:
Shaun Jackman 2017-09-25 11:37:07 -07:00
parent 1e57445eca
commit 3ebf282269
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_installer.rb
View File

@ -84,8 +84,7 @@ class FormulaInstaller
return false if @pour_failed return false if @pour_failed
bottle = formula.bottle return false if !formula.bottled? && !formula.local_bottle_path
return false if !bottle && !formula.local_bottle_path
return true if force_bottle? return true if force_bottle?
return false if build_from_source? || build_bottle? || interactive? return false if build_from_source? || build_bottle? || interactive?
return false if ARGV.cc return false if ARGV.cc
@ -101,11 +100,11 @@ class FormulaInstaller
return false return false
end end
unless bottle.compatible_cellar? unless formula.bottled?
if install_bottle_options[:warn] if install_bottle_options[:warn]
opoo <<-EOS.undent opoo <<-EOS.undent
Building #{formula.full_name} from source: Building #{formula.full_name} from source:
The bottle needs a #{bottle.cellar} Cellar (yours is #{HOMEBREW_CELLAR}). The bottle needs a #{formula.bottle_specification.cellar} Cellar (yours is #{HOMEBREW_CELLAR}).
EOS EOS
end end
return false return false

2
Library/Homebrew/test/bottle_hooks_spec.rb
View File

@ -8,7 +8,7 @@ describe Homebrew::Hooks::Bottles do
let(:formula) do let(:formula) do
double( double(
bottle: nil, bottled?: false,
local_bottle_path: nil, local_bottle_path: nil,
bottle_disabled?: false, bottle_disabled?: false,
some_random_method: true, some_random_method: true,