From 5b7dd99e999111045348637b51bd85e01d88afda Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 18 Jan 2016 08:59:43 +0000
Subject: [PATCH] Revert "Revert "dependency: don't recurse infinitely.""

This reverts commit fa43883dd1cd82f234b79c4a322339f03b9c098d.

Closes Homebrew/homebrew#48187.
---
 Library/Homebrew/dependency.rb                     | 8 +++++++-
 Library/Homebrew/test/test_dependency_expansion.rb | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index 0e03ae0ea3..ca500faefa 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -71,25 +71,31 @@ 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
 
diff --git a/Library/Homebrew/test/test_dependency_expansion.rb b/Library/Homebrew/test/test_dependency_expansion.rb
index c6ac84c7cf..80947376fa 100644
--- a/Library/Homebrew/test/test_dependency_expansion.rb
+++ b/Library/Homebrew/test/test_dependency_expansion.rb
@@ -73,7 +73,7 @@ class DependencyExpansionTests < Homebrew::TestCase
   def test_merger_preserves_env_proc
     env_proc = stub
     dep = Dependency.new("foo", [], env_proc)
-    dep.stubs(:to_formula).returns(stub(:deps => []))
+    dep.stubs(:to_formula).returns(stub(:deps => [], :name => "foo"))
     @deps.replace [dep]
     assert_equal env_proc, Dependency.expand(@f).first.env_proc
   end