From 7bd938206e9f4b6fa4ddbde29aad23a4019ee602 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Tue, 8 Dec 2009 16:02:30 -0800 Subject: [PATCH] Just try requiring, instead of looking for the name first. --- Library/Homebrew/formula.rb | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 1900d3684f..4d4f203e72 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -48,16 +48,9 @@ class Formulary end def self.read name - Formulary.names.each do |f| - next if f != name - - require Formula.path(name) - klass_name = Formula.class_s(name) - klass = eval(klass_name) - return klass - end - - return nil + require Formula.path(name) rescue return nil + klass_name = Formula.class_s(name) + eval(klass_name) end # Loads all formula classes. @@ -66,7 +59,6 @@ class Formulary require Formula.path(name) klass_name = Formula.class_s(name) klass = eval(klass_name) - yield name, klass end end