From 55bd25ff4c270d6146a1df9409ec9c35f76e2fac Mon Sep 17 00:00:00 2001 From: Max Howell Date: Fri, 5 Nov 2010 13:44:24 +0000 Subject: Formula.resolve_alias to compatability.rb --- Library/Homebrew/extend/ARGV.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Library/Homebrew/extend') diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 370035ea6..c7195bbcd 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -9,7 +9,7 @@ module HomebrewArgvExtension def formulae require 'formula' - @formulae ||= downcased_unique_named.map{ |name| Formula.factory(Formula.resolve_alias(name)) } + @formulae ||= downcased_unique_named.map{ |name| Formula.factory name } raise FormulaUnspecifiedError if @formulae.empty? @formulae end @@ -18,7 +18,7 @@ module HomebrewArgvExtension require 'keg' require 'formula' @kegs ||= downcased_unique_named.collect do |name| - d = HOMEBREW_CELLAR/Formula.resolve_alias(name) + d = HOMEBREW_CELLAR/Formula.caniconical_name(name) dirs = d.children.select{ |pn| pn.directory? } rescue [] raise NoSuchKegError.new(name) if not d.directory? or dirs.length == 0 raise MultipleVersionsInstalledError.new(name) if dirs.length > 1 -- cgit v1.2.3