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

Remove used options check from install_bottle?

Browse Source 
This is now handled by requiring that options are always passed to the
installer explicitly.
This commit is contained in:
Jack Nagel 2014-03-10 14:56:02 -05:00
parent 2182ce4d16
commit 4b80d30bab
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/bottles.rb
View File

@ -12,7 +12,6 @@ def install_bottle? f, options={:warn=>false}
return true if f.local_bottle_path return true if f.local_bottle_path
return true if ARGV.force_bottle? return true if ARGV.force_bottle?
return false unless f.pour_bottle? return false unless f.pour_bottle?
return false unless f.default_build?
return false unless f.bottle return false unless f.bottle
if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s

4
Library/Homebrew/formula.rb
View File

@ -80,10 +80,6 @@ class Formula
end end
end end
def default_build?
self.class.build.used_options.empty?
end
def determine_build_options def determine_build_options
build = active_spec.build build = active_spec.build
options.each { |opt, desc| build.add(opt, desc) } options.each { |opt, desc| build.add(opt, desc) }