From cd0366da0d489093a9704b0e38569ebe7bd6f4e3 Mon Sep 17 00:00:00 2001
From: Mike McQuaid
Date: Sun, 17 Jan 2016 20:55:05 +0000
Subject: Revert "dependency: don't recurse infinitely."

This reverts commit 16ffbe1a2b2d99da42481dc50f70dbfee4472da6.
---
 Library/Homebrew/dependency.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index ca500faef..0e03ae0ea 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -71,31 +71,25 @@ class Dependency
     # The default filter, which is applied when a block is not given, omits
     # optionals and recommendeds based on what the dependent has asked for.
     def expand(dependent, deps = dependent.deps, &block)
-      # Keep track dependencies to avoid infinite cyclic dependency recursion.
-      @expand_stack ||= []
-      @expand_stack.push dependent.name
-
       expanded_deps = []
 
       deps.each do |dep|
+        # FIXME: don't hide cyclic dependencies
         next if dependent.name == dep.name
 
         case action(dependent, dep, &block)
         when :prune
           next
         when :skip
-          next if @expand_stack.include? dep.name
           expanded_deps.concat(expand(dep.to_formula, &block))
         when :keep_but_prune_recursive_deps
           expanded_deps << dep
         else
-          next if @expand_stack.include? dep.name
           expanded_deps.concat(expand(dep.to_formula, &block))
           expanded_deps << dep
         end
       end
 
-      @expand_stack.pop
       merge_repeats(expanded_deps)
     end
 
-- 
cgit v1.2.3