aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMike McQuaid2016-01-17 20:55:05 +0000
committerMike McQuaid2016-01-17 20:55:05 +0000
commitcd0366da0d489093a9704b0e38569ebe7bd6f4e3 (patch)
tree716f40af8467d7b068cb24bbcf461fc1295710c6 /Library
parent20106e42684b3befd3de6c3dece9c2a6ec88871c (diff)
downloadbrew-cd0366da0d489093a9704b0e38569ebe7bd6f4e3.tar.bz2
Revert "dependency: don't recurse infinitely."
This reverts commit 16ffbe1a2b2d99da42481dc50f70dbfee4472da6.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/dependency.rb8
1 files changed, 1 insertions, 7 deletions
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