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

formula_installer: fix :test requirement expansion.

Browse Source
This commit is contained in:
Mike McQuaid 2020-05-20 12:24:54 +01:00
parent d254730e78
commit 89a0984d42
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/formula_installer.rb
View File

@ -457,12 +457,18 @@ class FormulaInstaller
Requirement.prune Requirement.prune
elsif req.satisfied? elsif req.satisfied?
Requirement.prune Requirement.prune
elsif include_test? && req.test? elsif req.test? || req.build?
next keep = false
elsif !runtime_requirements.include?(req) && install_bottle_for_dependent keep ||= runtime_requirements.include?(req)
Requirement.prune keep ||= req.test? && include_test? && dependent == f
elsif (dep = formula_deps_map[dependent.name]) && dep.build? keep ||= req.build? && !install_bottle_for_dependent
keep ||= (dep = formula_deps_map[dependent.name]) && !dep.build?
if keep
unsatisfied_reqs[dependent] << req
else
Requirement.prune Requirement.prune
end
else else
unsatisfied_reqs[dependent] << req unsatisfied_reqs[dependent] << req
end end