From 301f1b20e698107e2f3b13bf4a2e8035affbaf03 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Thu, 26 Jun 2014 22:28:00 -0500
Subject: Remove a dead branch from ARGV.kegs

rack cannot be nil at the point where FormulaUnavailableError is raised,
so we don't need a branch to deal with that.
---
 Library/Homebrew/extend/ARGV.rb | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

(limited to 'Library/Homebrew')

diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 7da130001..e3cb6da7a 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -26,29 +26,27 @@ module HomebrewArgvExtension
       linked_keg_ref = HOMEBREW_REPOSITORY/"Library/LinkedKegs"/name
       opt_prefix = HOMEBREW_PREFIX/"opt"/name
 
-      if opt_prefix.symlink? && opt_prefix.directory?
-        Keg.new(opt_prefix.resolved_path)
-      elsif linked_keg_ref.symlink? && linked_keg_ref.directory?
-        Keg.new(linked_keg_ref.resolved_path)
-      elsif dirs.length == 1
-        Keg.new(dirs.first)
-      elsif (prefix = Formulary.factory(canonical_name).prefix).directory?
-        Keg.new(prefix)
-      else
-        raise MultipleVersionsInstalledError.new(name)
+      begin
+        if opt_prefix.symlink? && opt_prefix.directory?
+          Keg.new(opt_prefix.resolved_path)
+        elsif linked_keg_ref.symlink? && linked_keg_ref.directory?
+          Keg.new(linked_keg_ref.resolved_path)
+        elsif dirs.length == 1
+          Keg.new(dirs.first)
+        elsif (prefix = Formulary.factory(canonical_name).prefix).directory?
+          Keg.new(prefix)
+        else
+          raise MultipleVersionsInstalledError.new(name)
+        end
+      rescue FormulaUnavailableError
+        raise <<-EOS.undent
+          Multiple kegs installed to #{rack}
+          However we don't know which one you refer to.
+          Please delete (with rm -rf!) all but one and then try again.
+          Sorry, we know this is lame.
+        EOS
       end
     end
-  rescue FormulaUnavailableError
-    if rack
-      raise <<-EOS.undent
-        Multiple kegs installed to #{rack}
-        However we don't know which one you refer to.
-        Please delete (with rm -rf!) all but one and then try again.
-        Sorry, we know this is lame.
-      EOS
-    else
-      raise
-    end
   end
 
   # self documenting perhaps?
-- 
cgit v1.2.3