From c8fd1214bde185c392017994154ce52465a8b661 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 14 Jun 2014 16:04:28 -0500 Subject: [PATCH] Revert "Only do formula class sanity checks once" This reverts commit ace78b1f3a59a893c7068e485555acf792470080. Fixes Homebrew/homebrew#30154. --- Library/Homebrew/formulary.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 8342c3dede..31a7fd51ec 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -59,9 +59,7 @@ class Formulary raise FormulaUnavailableError.new(name) end - if have_klass - Formulary.get_formula_class(class_name) - else + unless have_klass STDERR.puts "#{$0} (#{self.class.name}): loading #{path}" if ARGV.debug? begin require path @@ -73,13 +71,13 @@ class Formulary raise if ARGV.debug? # let's see the REAL error raise FormulaUnavailableError.new(name) end - - klass = Formulary.get_formula_class(class_name) - if klass == Formula || !(klass < Formula) - raise FormulaUnavailableError.new(name) - end - klass end + + klass = Formulary.get_formula_class(class_name) + if klass == Formula || !(klass < Formula) + raise FormulaUnavailableError.new(name) + end + klass end end