pour_bottle?: Ensure local bottles are compatible

Don't ignore f.pour_bottle? and compatible_cellar? when pouring
a local bottle. --force-bottle may be used to pour a local
bottle that is incompatible, as it is for remote bottles.
This commit is contained in:
Shaun Jackman 2017-08-30 09:24:55 -07:00
parent 156bca7dfb
commit 008eaac60d

View File

@ -91,7 +91,6 @@ class FormulaInstaller
return false if ARGV.cc return false if ARGV.cc
return false unless options.empty? return false unless options.empty?
return false if formula.bottle_disabled? return false if formula.bottle_disabled?
return true if formula.local_bottle_path
unless formula.pour_bottle? unless formula.pour_bottle?
if install_bottle_options[:warn] && formula.pour_bottle_check_unsatisfied_reason if install_bottle_options[:warn] && formula.pour_bottle_check_unsatisfied_reason
opoo <<-EOS.undent opoo <<-EOS.undent