aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorMax Howell2012-03-06 13:43:41 +0000
committerMax Howell2012-03-06 13:47:31 +0000
commit6868bf0d6ece15d322b1766bf7ff047d4b5e7dcc (patch)
tree1c74b8333c0180249882485dcb03de9cfef46f11 /Library/Homebrew/extend
parent7ddaaf9bb030d49aba5eb0e8d8fd7944bc6532ee (diff)
downloadbrew-6868bf0d6ece15d322b1766bf7ff047d4b5e7dcc.tar.bz2
Don't require formula files for `brew rm --force`
In fixing this I also made it so that ARGV.kegs will return the LinkedKeg if the symlink is set. Which is almost always is. This neatly avoids most multiple-kegs issues. Fixes Homebrew/homebrew#10685.
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/ARGV.rb20
1 files changed, 13 insertions, 7 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 47c770ecd..24d70cb1f 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -17,20 +17,26 @@ module HomebrewArgvExtension
require 'keg'
require 'formula'
@kegs ||= downcased_unique_named.collect do |name|
- n = Formula.canonical_name(name)
- rack = HOMEBREW_CELLAR + if n.include? "/"
+ canonical_name = Formula.canonical_name(name)
+ rack = HOMEBREW_CELLAR + 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.
- Pathname.new(n).stem
+ Pathname.new(canonical_name).stem
else
- n
+ canonical_name
end
dirs = rack.children.select{ |pn| pn.directory? } rescue []
raise NoSuchKegError.new(name) if not rack.directory? or dirs.length == 0
- raise MultipleVersionsInstalledError.new(name) if dirs.length > 1
- Keg.new dirs.first
+
+ linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name
+
+ if not linked_keg_ref.symlink?
+ raise MultipleVersionsInstalledError.new(name) if dirs.length > 1
+ Keg.new(dirs.first)
+ else
+ Keg.new(linked_keg_ref.realpath)
+ end
end
- return @kegs
end
# self documenting perhaps?