diff options
| author | Xu Cheng | 2015-07-24 16:06:26 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-07-24 16:08:44 +0800 |
| commit | 18457061878e5b64a31a98c8db87d17374a67e3c (patch) | |
| tree | a1d3af00895be3addbd44e74afa441c7edc8497d /Library/Homebrew | |
| parent | 4625fd335c62e0bc6bcad2d4de482174bc353ee3 (diff) | |
| download | brew-18457061878e5b64a31a98c8db87d17374a67e3c.tar.bz2 | |
formula_installer: better priority for pour_bottle?
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 428fb203c..2b66f8e10 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? |