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

dependencies: fix recursive_includes not handling deps of test deps

Browse Source
This commit is contained in:
Bo Anderson 2020-05-19 19:14:40 +01:00
parent a2939be08a
commit b8ba083e12
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/dependencies.rb
View File

@ -100,16 +100,11 @@ module Homebrew
klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep) klass.prune if ignores.include?("recommended?") || dependent.build.without?(dep)
elsif dep.optional? elsif dep.optional?
klass.prune if !includes.include?("optional?") && !dependent.build.with?(dep) klass.prune if !includes.include?("optional?") && !dependent.build.with?(dep)
elsif dep.test? elsif dep.build? || dep.test?
if includes.include?("test?") keep = false
Dependency.keep_but_prune_recursive_deps if type == :dependencies keep ||= dep.test? && includes.include?("test?") && dependent == formula
elsif dep.build? keep ||= dep.build? && includes.include?("build?")
klass.prune unless includes.include?("build?") klass.prune unless keep
else
klass.prune
end
elsif dep.build?
klass.prune unless includes.include?("build?")
end end
# If a tap isn't installed, we can't find the dependencies of one of # If a tap isn't installed, we can't find the dependencies of one of