aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJack Nagel2014-06-14 16:04:28 -0500
committerJack Nagel2014-06-14 16:04:38 -0500
commitc8fd1214bde185c392017994154ce52465a8b661 (patch)
tree9c686b750657f1993b631aefde56385752592241 /Library
parent014ac2119308763055c7ea70f0416046146bce25 (diff)
downloadbrew-c8fd1214bde185c392017994154ce52465a8b661.tar.bz2
Revert "Only do formula class sanity checks once"
This reverts commit ace78b1f3a59a893c7068e485555acf792470080. Fixes Homebrew/homebrew#30154.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formulary.rb14
1 files changed, 6 insertions, 8 deletions
diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index 8342c3ded..31a7fd51e 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
+ end
- klass = Formulary.get_formula_class(class_name)
- if klass == Formula || !(klass < Formula)
- raise FormulaUnavailableError.new(name)
- end
- klass
+ klass = Formulary.get_formula_class(class_name)
+ if klass == Formula || !(klass < Formula)
+ raise FormulaUnavailableError.new(name)
end
+ klass
end
end