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

formula_installer: let build_bottle? check bottle_disabled?

Browse Source 
Also don't pour bottle if it's disabled.
This commit is contained in:
Xu Cheng 2015-09-14 19:59:00 +08:00
parent b5032ad2cb
commit 975771ab35
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/formula_installer.rb
View File

@ -29,9 +29,9 @@ class FormulaInstaller
end end
attr_reader :formula attr_reader :formula
attr_accessor :options attr_accessor :options, :build_bottle
mode_attr_accessor :show_summary_heading, :show_header mode_attr_accessor :show_summary_heading, :show_header
mode_attr_accessor :build_from_source, :build_bottle, :force_bottle mode_attr_accessor :build_from_source, :force_bottle
mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git mode_attr_accessor :ignore_deps, :only_deps, :interactive, :git
mode_attr_accessor :verbose, :debug, :quieter mode_attr_accessor :verbose, :debug, :quieter
@ -69,6 +69,10 @@ class FormulaInstaller
raise BuildFlagsError.new(build_flags) unless build_flags.empty? raise BuildFlagsError.new(build_flags) unless build_flags.empty?
end end
def build_bottle?
!!@build_bottle && !formula.bottle_disabled?
end
def pour_bottle?(install_bottle_options = { :warn=>false }) def pour_bottle?(install_bottle_options = { :warn=>false })
return true if Homebrew::Hooks::Bottles.formula_has_bottle?(formula) return true if Homebrew::Hooks::Bottles.formula_has_bottle?(formula)
@ -78,6 +82,7 @@ class FormulaInstaller
return true if force_bottle? && bottle return true if force_bottle? && bottle
return false if build_from_source? || build_bottle? || interactive? return false if build_from_source? || build_bottle? || interactive?
return false unless options.empty? return false unless options.empty?
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 bottle && formula.pour_bottle?