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

Remove a dead branch from ARGV.kegs

Browse Source 
rack cannot be nil at the point where FormulaUnavailableError is raised,
so we don't need a branch to deal with that.
This commit is contained in:
Jack Nagel 2014-06-26 22:28:00 -05:00
parent dce7b04ea5
commit 301f1b20e6
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ module HomebrewArgvExtension
linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name
opt_prefix = HOMEBREW_PREFIX/"opt"/name opt_prefix = HOMEBREW_PREFIX/"opt"/name
begin
if opt_prefix.symlink? && opt_prefix.directory? if opt_prefix.symlink? && opt_prefix.directory?
Keg.new(opt_prefix.resolved_path) Keg.new(opt_prefix.resolved_path)
elsif linked_keg_ref.symlink? && linked_keg_ref.directory? elsif linked_keg_ref.symlink? && linked_keg_ref.directory?
@ -37,17 +38,14 @@ module HomebrewArgvExtension
else else
raise MultipleVersionsInstalledError.new(name) raise MultipleVersionsInstalledError.new(name)
end end
end
rescue FormulaUnavailableError rescue FormulaUnavailableError
if rack
raise <<-EOS.undent raise <<-EOS.undent
Multiple kegs installed to #{rack} Multiple kegs installed to #{rack}
However we don't know which one you refer to. However we don't know which one you refer to.
Please delete (with rm -rf!) all but one and then try again. Please delete (with rm -rf!) all but one and then try again.
Sorry, we know this is lame. Sorry, we know this is lame.
EOS EOS
else end
raise
end end
end end