admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "Only do formula class sanity checks once"

Browse Source 
This reverts commit ace78b1f3a59a893c7068e485555acf792470080.

Fixes Homebrew/homebrew#30154.
This commit is contained in:
Jack Nagel 2014-06-14 16:04:28 -05:00
parent 014ac21193
commit c8fd1214bd
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formulary.rb
View File

@ -59,9 +59,7 @@ class Formulary
raise FormulaUnavailableError.new(name) raise FormulaUnavailableError.new(name)
end end
if have_klass unless have_klass
Formulary.get_formula_class(class_name)
else
STDERR.puts "#{$0} (#{self.class.name}): loading #{path}" if ARGV.debug? STDERR.puts "#{$0} (#{self.class.name}): loading #{path}" if ARGV.debug?
begin begin
require path require path
@ -73,6 +71,7 @@ class Formulary
raise if ARGV.debug? # let's see the REAL error raise if ARGV.debug? # let's see the REAL error
raise FormulaUnavailableError.new(name) raise FormulaUnavailableError.new(name)
end end
end
klass = Formulary.get_formula_class(class_name) klass = Formulary.get_formula_class(class_name)
if klass == Formula || !(klass < Formula) if klass == Formula || !(klass < Formula)
@ -81,7 +80,6 @@ class Formulary
klass klass
end end
end end
end
# Loads formulae from bottles. # Loads formulae from bottles.
class BottleLoader < FormulaLoader class BottleLoader < FormulaLoader