Skip to content
Snippets Groups Projects
Commit 8b578712 authored by Xu Cheng's avatar Xu Cheng
Browse files

uses/deps: fix for recursive deps/reqs


Closes Homebrew/homebrew#39906.

Signed-off-by: default avatarXu Cheng <xucheng@me.com>
parent cacad69a
No related branches found
No related tags found
No related merge requests found
......@@ -34,11 +34,11 @@ module Homebrew
ignores << "optional?" if ARGV.include? "--skip-optional"
if recursive
deps = f.recursive_dependencies.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) }
deps = f.recursive_dependencies do |dependent, dep|
Dependency.prune if ignores.any? { |ignore| dep.send(ignore) } && !dependent.build.with?(dep)
end
reqs = f.recursive_requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) }
reqs = f.recursive_requirements do |dependent, req|
Requirement.prune if ignores.any? { |ignore| req.send(ignore) } && !dependent.build.with?(req)
end
else
deps = f.deps.reject do |dep|
......
......@@ -19,11 +19,11 @@ module Homebrew
used_formulae.all? do |ff|
begin
if recursive
deps = f.recursive_dependencies.reject do |dep|
ignores.any? { |ignore| dep.send(ignore) }
deps = f.recursive_dependencies do |dependent, dep|
Dependency.prune if ignores.any? { |ignore| dep.send(ignore) } && !dependent.build.with?(dep)
end
reqs = f.recursive_requirements.reject do |req|
ignores.any? { |ignore| req.send(ignore) }
reqs = f.recursive_requirements do |dependent, req|
Requirement.prune if ignores.any? { |ignore| req.send(ignore) } && !dependent.build.with?(req)
end
deps.any? { |dep| dep.to_formula.name == ff.name } ||
reqs.any? { |req| req.name == ff.name || req.class.default_formula == ff.name }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment