admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

formula_installer: better priority for pour_bottle?

Browse Source
This commit is contained in:
Xu Cheng 2015-07-24 16:06:26 +08:00
parent 4625fd335c
commit 1845706187
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/formula_installer.rb
View File

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