Merge pull request #15529 from carlocab/deps-fix

dependencies_helpers: fix pruning of build/test deps
This commit is contained in:
Carlo Cabrera 2023-06-06 16:25:35 +08:00 committed by GitHub
commit 322a0189ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -45,13 +45,13 @@ module DependenciesHelpers
klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
elsif dep.optional?
klass.prune if includes.exclude?("optional?") && !dependent.build.with?(dep)
elsif dep.satisfied?
klass.prune if ignores.include?("satisfied?")
elsif dep.build? || dep.test?
keep = false
keep ||= dep.test? && includes.include?("test?") && dependent == root_dependent
keep ||= dep.build? && includes.include?("build?")
klass.prune unless keep
elsif dep.satisfied?
klass.prune if ignores.include?("satisfied?")
end
# If a tap isn't installed, we can't find the dependencies of one of