Only do formula class sanity checks once

1 files changed, 8 insertions, 6 deletions

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 31a7fd51e..8342c3ded 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -59,7 +59,9 @@ class Formulary
         raise FormulaUnavailableError.new(name)
       end
 
-      unless have_klass
+      if have_klass
+        Formulary.get_formula_class(class_name)
+      else
         STDERR.puts "#{$0} (#{self.class.name}): loading #{path}" if ARGV.debug?
         begin
           require path
@@ -71,13 +73,13 @@ class Formulary
           raise if ARGV.debug?  # let's see the REAL error
           raise FormulaUnavailableError.new(name)
         end
-      end
 
-      klass = Formulary.get_formula_class(class_name)
-      if klass == Formula || !(klass < Formula)
-        raise FormulaUnavailableError.new(name)
+        klass = Formulary.get_formula_class(class_name)
+        if klass == Formula || !(klass < Formula)
+          raise FormulaUnavailableError.new(name)
+        end
+        klass
       end
-      klass
     end
   end