From be9fde62669e082cc6d728258f5e9c0e030f1e0a Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Thu, 30 Jul 2015 16:33:19 +0800 Subject: [PATCH] Formulary#from_rack: auto resolve spec --- Library/Homebrew/formulary.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index f1fed506eb..483ea934fb 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -175,13 +175,16 @@ class Formulary end # 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) } : [] 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" factory(rack.basename.to_s, spec)