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

Use canonicalized name in NoSuchKegError message

Browse Source 
cf. Homebrew/homebrew#22778.
This commit is contained in:
Jack Nagel 2014-03-15 12:55:14 -05:00
parent eab90dcb56
commit e236901e56
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/extend/ARGV.rb
View File

@ -19,15 +19,17 @@ module HomebrewArgvExtension
require 'formula' require 'formula'
@kegs ||= downcased_unique_named.collect do |name| @kegs ||= downcased_unique_named.collect do |name|
canonical_name = Formula.canonical_name(name) canonical_name = Formula.canonical_name(name)
rack = HOMEBREW_CELLAR + if canonical_name.include? "/"
if canonical_name.include? "/"
# canonical_name returns a path if it was a formula installed via a # canonical_name returns a path if it was a formula installed via a
# URL. And we only want the name. FIXME that function is insane. # URL. And we only want the name. FIXME that function is insane.
Pathname.new(canonical_name).stem rack = HOMEBREW_CELLAR/Pathname.new(canonical_name).stem
else else
canonical_name rack = HOMEBREW_CELLAR/canonical_name
end end
dirs = rack.children.select{ |pn| pn.directory? } rescue []
raise NoSuchKegError.new(name) if not rack.directory? or dirs.length == 0 dirs = rack.directory? ? rack.subdirs : []
raise NoSuchKegError.new(rack.basename.to_s) if not rack.directory? or dirs.empty?
linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name