formula_installer: tweak priority of true

Closes Homebrew/homebrew#41913.

Signed-off-by: Dominyk Tiller <dominyktiller@gmail.com>
This commit is contained in:
Dominyk Tiller 2015-07-23 20:07:34 +01:00
parent c6e3a0240a
commit 2751449abb

View File

@ -61,11 +61,10 @@ class FormulaInstaller
return false if @pour_failed return false if @pour_failed
bottle = formula.bottle bottle = formula.bottle
return true if force_bottle? && bottle return true if (force_bottle? && bottle) || formula.local_bottle_path
return false if build_from_source? || build_bottle? || interactive? || formula.file_modified? return false if build_from_source? || build_bottle? || interactive? || formula.file_modified?
return false unless options.empty? return false unless options.empty?
return true if formula.local_bottle_path
return false unless bottle && formula.pour_bottle? return false unless bottle && formula.pour_bottle?
unless bottle.compatible_cellar? unless bottle.compatible_cellar?