admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Revert "dependency: don't recurse infinitely."

Browse Source 
This reverts commit 16ffbe1a2b2d99da42481dc50f70dbfee4472da6.
This commit is contained in:
Mike McQuaid 2016-01-17 20:55:05 +00:00
parent 20106e4268
commit cd0366da0d
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dependency.rb
View File

@ -71,31 +71,25 @@ class Dependency
# The default filter, which is applied when a block is not given, omits # The default filter, which is applied when a block is not given, omits
# optionals and recommendeds based on what the dependent has asked for. # optionals and recommendeds based on what the dependent has asked for.
def expand(dependent, deps = dependent.deps, &block) 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 = [] expanded_deps = []
deps.each do |dep| deps.each do |dep|
# FIXME: don't hide cyclic dependencies
next if dependent.name == dep.name next if dependent.name == dep.name
case action(dependent, dep, &block) case action(dependent, dep, &block)
when :prune when :prune
next next
when :skip when :skip
next if @expand_stack.include? dep.name
expanded_deps.concat(expand(dep.to_formula, &block)) expanded_deps.concat(expand(dep.to_formula, &block))
when :keep_but_prune_recursive_deps when :keep_but_prune_recursive_deps
expanded_deps << dep expanded_deps << dep
else else
next if @expand_stack.include? dep.name
expanded_deps.concat(expand(dep.to_formula, &block)) expanded_deps.concat(expand(dep.to_formula, &block))
expanded_deps << dep expanded_deps << dep
end end
end end
@expand_stack.pop
merge_repeats(expanded_deps) merge_repeats(expanded_deps)
end end