From aa556177f77f13506f68ab71733c05bddcfee7a5 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Sat, 5 Apr 2014 17:41:37 -0500
Subject: Combine conditional branches that do the same thing

---
 Library/Homebrew/formulary.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb
index c2f977c2e..34e40fa23 100644
--- a/Library/Homebrew/formulary.rb
+++ b/Library/Homebrew/formulary.rb
@@ -176,11 +176,9 @@ class Formulary
         # name appears to be a tapped formula, so we don't munge it
         # in order to provide a useful error message when require fails.
         f = TapLoader.new(name_or_path)
-      elsif name_or_path.include? "/"
+      elsif name_or_path.include?("/") || File.extname(name_or_path) == ".rb"
         # If name was a path or mapped to a cached formula
         f = FromPathLoader.new(name_or_path)
-      elsif File.extname(name_or_path) == ".rb"
-        f = FromPathLoader.new(name_or_path)
       else
         f = StandardLoader.new(name_or_path)
       end
-- 
cgit v1.2.3