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

Give this condition a more revealing name

Browse Source
This commit is contained in:
Jack Nagel 2013-09-21 19:27:24 -05:00
parent 36f3617494
commit 2eefba005f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/bottles.rb
View File

@ -17,7 +17,7 @@ def install_bottle? f, options={:warn=>false}
return false if ARGV.build_from_source? return false if ARGV.build_from_source?
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.build.used_options.empty? return false unless f.default_build?
return false unless bottle_current?(f) return false unless bottle_current?(f)
if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s if f.bottle.cellar != :any && f.bottle.cellar != HOMEBREW_CELLAR.to_s
if options[:warn] if options[:warn]

6
Library/Homebrew/formula.rb
View File

@ -88,6 +88,12 @@ class Formula
end end
end end
def default_build?
build = self.class.build.dup
build.concat(stable.options)
build.used_options.empty?
end
def url; active_spec.url; end def url; active_spec.url; end
def version; active_spec.version; end def version; active_spec.version; end
def mirrors; active_spec.mirrors; end def mirrors; active_spec.mirrors; end