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

uses: use Formula#runtime_dependencies.

Browse Source
This commit is contained in:
Mike McQuaid 2018-03-25 12:48:40 +01:00
parent 42a39b16bf
commit ff7294ee1f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/cmd/uses.rb
View File

@ -42,14 +42,21 @@ module Homebrew
formulae = ARGV.include?("--installed") ? Formula.installed : Formula formulae = ARGV.include?("--installed") ? Formula.installed : Formula
recursive = ARGV.flag? "--recursive" recursive = ARGV.flag? "--recursive"
only_installed_arg = ARGV.include?("--installed") &&
!ARGV.include?("--include-build") &&
!ARGV.include?("--include-test") &&
!ARGV.include?("--include-optional") &&
!ARGV.include?("--skip-recommended")
includes, ignores = argv_includes_ignores(ARGV) includes, ignores = argv_includes_ignores(ARGV)
uses = formulae.select do |f| uses = formulae.select do |f|
used_formulae.all? do |ff| used_formulae.all? do |ff|
begin begin
deps = f.runtime_dependencies if only_installed_arg
if recursive if recursive
deps = recursive_includes(Dependency, f, includes, ignores) deps ||= recursive_includes(Dependency, f, includes, ignores)
dep_formulae = deps.flat_map do |dep| dep_formulae = deps.flat_map do |dep|
begin begin
dep.to_formula dep.to_formula
@ -76,7 +83,7 @@ module Homebrew
reqs = reqs_by_formula.map(&:last) reqs = reqs_by_formula.map(&:last)
else else
deps = reject_ignores(f.deps, ignores, includes) deps ||= reject_ignores(f.deps, ignores, includes)
reqs = reject_ignores(f.requirements, ignores, includes) reqs = reject_ignores(f.requirements, ignores, includes)
end end