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

Remove obsolete guards around canonical_name return value

Browse Source
This commit is contained in:
Jack Nagel 2014-04-05 22:03:34 -05:00
parent 20f4b31763
commit d8bdcf84af
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cmd/edit.rb
View File

@ -27,11 +27,7 @@ module Homebrew extend self
# Don't use ARGV.formulae as that will throw if the file doesn't parse # Don't use ARGV.formulae as that will throw if the file doesn't parse
paths = ARGV.named.map do |name| paths = ARGV.named.map do |name|
name = Formula.canonical_name name name = Formula.canonical_name name
if name.include? '/' Formula.path(name)
Pathname.new(name)
else
Formula.path(name)
end
end end
unless ARGV.force? unless ARGV.force?
paths.each do |path| paths.each do |path|

4
Library/Homebrew/cmd/uninstall.rb
View File

@ -18,10 +18,6 @@ module Homebrew extend self
else else
ARGV.named.each do |name| ARGV.named.each do |name|
name = Formula.canonical_name(name) name = Formula.canonical_name(name)
# FIXME canonical_name is insane
raise "Invalid usage" if name.include? '/'
rack = HOMEBREW_CELLAR/name rack = HOMEBREW_CELLAR/name
if rack.directory? if rack.directory?

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

@ -19,16 +19,9 @@ 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/canonical_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
dirs = rack.directory? ? rack.subdirs : [] dirs = rack.directory? ? rack.subdirs : []
raise NoSuchKegError.new(rack.basename.to_s) if not rack.directory? or dirs.empty? 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