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

formula_installer: cleanup existing pour_bottle logic.

Browse Source
This commit is contained in:
Mike McQuaid 2016-01-09 11:07:07 +00:00
parent 26ec9f9ea0
commit e62dc13252
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/formula_installer.rb
View File

@ -78,13 +78,14 @@ 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 false unless bottle
return true if force_bottle?
return false if build_from_source? || build_bottle? || interactive? return false if build_from_source? || build_bottle? || interactive?
return false if ARGV.cc return false if ARGV.cc
return false unless options.empty? return false unless options.empty?
return false if formula.bottle_disabled? return false if formula.bottle_disabled?
return true if formula.local_bottle_path return true if formula.local_bottle_path
return false unless bottle && formula.pour_bottle? return false unless formula.pour_bottle?
unless bottle.compatible_cellar? unless bottle.compatible_cellar?
if install_bottle_options[:warn] if install_bottle_options[:warn]