From 18457061878e5b64a31a98c8db87d17374a67e3c Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Fri, 24 Jul 2015 16:06:26 +0800 Subject: [PATCH] formula_installer: better priority for pour_bottle? --- Library/Homebrew/formula_installer.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 428fb203c8..2b66f8e109 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -61,10 +61,11 @@ class FormulaInstaller return false if @pour_failed bottle = formula.bottle - return true if (force_bottle? && bottle) || formula.local_bottle_path - return false if build_from_source? || build_bottle? || interactive? || formula.file_modified? + return true if force_bottle? && bottle + return false if build_from_source? || build_bottle? || interactive? return false unless options.empty? - + return true if formula.local_bottle_path + return false if formula.file_modified? return false unless bottle && formula.pour_bottle? unless bottle.compatible_cellar?