aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaun Jackman2017-08-30 09:24:55 -0700
committerShaun Jackman2017-08-30 10:16:49 -0700
commit008eaac60da0bfaba4e54fb0febeb172b7976898 (patch)
treea3acb3aa5cd29af969920a2719d738ffc9a45b12
parent156bca7dfb22e0fcbfd1c2a06d15330e8b9b454d (diff)
downloadbrew-008eaac60da0bfaba4e54fb0febeb172b7976898.tar.bz2
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.
-rw-r--r--Library/Homebrew/formula_installer.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 6c5b8bdab..5aa06e9f0 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -91,7 +91,6 @@ class FormulaInstaller
return false if ARGV.cc
return false unless options.empty?
return false if formula.bottle_disabled?
- return true if formula.local_bottle_path
unless formula.pour_bottle?
if install_bottle_options[:warn] && formula.pour_bottle_check_unsatisfied_reason
opoo <<-EOS.undent