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

formula_installer: fix build/test reqs not being pruned correctly

Browse Source 
Fixes #7618.
This commit is contained in:
Bo Anderson 2020-05-20 23:38:09 +01:00
parent 67d1bc6fb7
commit a3f589801f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formula_installer.rb
View File

@ -457,7 +457,6 @@ class FormulaInstaller
keep_build_test ||= runtime_requirements.include?(req) keep_build_test ||= runtime_requirements.include?(req)
keep_build_test ||= req.test? && include_test? && dependent == f keep_build_test ||= req.test? && include_test? && dependent == f
keep_build_test ||= req.build? && !install_bottle_for_dependent keep_build_test ||= req.build? && !install_bottle_for_dependent
keep_build_test ||= (dep = formula_deps_map[dependent.name]) && !dep.build?
if req.prune_from_option?(build) if req.prune_from_option?(build)
Requirement.prune Requirement.prune
@ -465,6 +464,8 @@ class FormulaInstaller
Requirement.prune Requirement.prune
elsif (req.build? || req.test?) && !keep_build_test elsif (req.build? || req.test?) && !keep_build_test
Requirement.prune Requirement.prune
elsif (dep = formula_deps_map[dependent.name]) && dep.build?
Requirement.prune
else else
unsatisfied_reqs[dependent] << req unsatisfied_reqs[dependent] << req
end end