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

Merge pull request #7613 from MikeMcQuaid/requirement_test

Browse Source 
formula_installer: fix :test requirement expansion.
This commit is contained in:
Mike McQuaid 2020-05-20 12:55:55 +01:00 committed by GitHub
commit bfc081ee0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
elsif req.satisfied?
Requirement.prune
elsif include_test? && req.test?
next
elsif !runtime_requirements.include?(req) && install_bottle_for_dependent
Requirement.prune
elsif (dep = formula_deps_map[dependent.name]) && dep.build?
elsif req.test? || req.build?
keep = false
keep ||= runtime_requirements.include?(req)
keep ||= req.test? && include_test? && dependent == f
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
end
else
unsatisfied_reqs[dependent] << req
end