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

Formulary#from_rack: auto resolve spec

Browse Source
This commit is contained in:
Xu Cheng 2015-07-30 16:33:19 +08:00
parent 773db6a3ba
commit be9fde6266
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Library/Homebrew/formulary.rb
View File

@ -175,13 +175,16 @@ class Formulary
end end
# Return a Formula instance for the given rack. # Return a Formula instance for the given rack.
def self.from_rack(rack, spec=:stable) # It will auto resolve formula's spec when requested spec is nil
def self.from_rack(rack, spec=nil)
kegs = rack.directory? ? rack.subdirs.map { |d| Keg.new(d) } : [] kegs = rack.directory? ? rack.subdirs.map { |d| Keg.new(d) } : []
keg = kegs.detect(&:linked?) || kegs.detect(&:optlinked?) || kegs.max_by(&:version) keg = kegs.detect(&:linked?) || kegs.detect(&:optlinked?) || kegs.max_by(&:version)
return factory(rack.basename.to_s, spec) unless keg return factory(rack.basename.to_s, spec || :stable) unless keg
tap = Tab.for_keg(keg).tap tab = Tab.for_keg(keg)
tap = tab.tap
spec ||= tab.spec
if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master" if tap.nil? || tap == "Homebrew/homebrew" || tap == "mxcl/master"
factory(rack.basename.to_s, spec) factory(rack.basename.to_s, spec)