formula_installer: cleanup existing pour_bottle logic.

1 files changed, 3 insertions, 2 deletions

diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index a46554caa..e65628376 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -78,13 +78,14 @@ class FormulaInstaller
     return false if @pour_failed
 
     bottle = formula.bottle
-    return true  if force_bottle? && bottle
+    return false unless bottle
+    return true  if force_bottle?
     return false if build_from_source? || build_bottle? || interactive?
     return false if ARGV.cc
     return false unless options.empty?
     return false if formula.bottle_disabled?
     return true  if formula.local_bottle_path
-    return false unless bottle && formula.pour_bottle?
+    return false unless formula.pour_bottle?
 
     unless bottle.compatible_cellar?
       if install_bottle_options[:warn]