Less code in begin/rescue block

1 files changed, 14 insertions, 13 deletions

diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index bbed75bee..bce893c91 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -214,27 +214,28 @@ module SharedEnvExtension
 
     begin
       gcc_formula = gcc_version_formula(name)
-      if gcc_formula.name == "gcc"
-        return if gcc_formula.opt_prefix.exist?
-        raise <<-EOS.undent
+    rescue FormulaUnavailableError
+      raise <<-EOS.undent
+      Homebrew GCC requested, but formula #{gcc_version_name} not found!
+      You may need to: brew tap homebrew/versions
+      EOS
+    end
+
+    if gcc_formula.name == "gcc"
+      return if gcc_formula.opt_prefix.exist?
+      raise <<-EOS.undent
         The Homebrew GCC was not installed.
         You must:
           brew install gcc
-        EOS
-      end
+      EOS
+    end
 
-      if !gcc_formula.opt_prefix.exist?
-        raise <<-EOS.undent
+    if !gcc_formula.opt_prefix.exist?
+      raise <<-EOS.undent
         The requested Homebrew GCC, #{gcc_version_name}, was not installed.
         You must:
           brew tap homebrew/versions
           brew install #{gcc_version_name}
-        EOS
-      end
-    rescue FormulaUnavailableError
-      raise <<-EOS.undent
-      Homebrew GCC requested, but formula #{gcc_version_name} not found!
-      You may need to: brew tap homebrew/versions
       EOS
     end
   end