Merge pull request #8141 from Bo98/recursive-fix

dependencies: fix error in recursive_includes
This commit is contained in:
Mike McQuaid 2020-07-30 16:48:07 +01:00 committed by GitHub
commit a8fdb8c169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -100,7 +100,7 @@ module DependenciesHelpers
klass.prune if !includes.include?("optional?") && !dependent.build.with?(dep)
elsif dep.build? || dep.test?
keep = false
keep ||= dep.test? && includes.include?("test?") && dependent == formula
keep ||= dep.test? && includes.include?("test?") && dependent == root_dependent
keep ||= dep.build? && includes.include?("build?")
klass.prune unless keep
end