diff options
| author | Jack Nagel | 2014-04-05 22:03:34 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-05 22:03:49 -0500 |
| commit | d8bdcf84aff98f9196ec067584b4b8f1ee917805 (patch) | |
| tree | b86fb99e62567f031d6afc616a4b58e66713e9de /Library/Homebrew/extend | |
| parent | 20f4b3176342f328ba83b02482d13fe5a7d62215 (diff) | |
| download | brew-d8bdcf84aff98f9196ec067584b4b8f1ee917805.tar.bz2 | |
Remove obsolete guards around canonical_name return value
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index 6923c2faf..9f76338d0 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -19,16 +19,9 @@ module HomebrewArgvExtension require 'formula' @kegs ||= downcased_unique_named.collect do |name| canonical_name = Formula.canonical_name(name) - - if canonical_name.include? "/" - # 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. - rack = HOMEBREW_CELLAR/Pathname.new(canonical_name).stem - else - rack = HOMEBREW_CELLAR/canonical_name - end - + rack = HOMEBREW_CELLAR/canonical_name 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 |