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

Merge pull request #6784 from MikeMcQuaid/deps_installed

Browse Source 
deps: use `runtime_dependencies` more readily.
This commit is contained in:
Mike McQuaid 2019-11-27 13:11:05 +00:00 committed by GitHub
commit 72b59e7076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/cmd/deps.rb
View File

@ -80,12 +80,13 @@ module Homebrew
return return
end end
@only_installed_arg = args.installed? && installed = args.installed? || ARGV.formulae.all?(&:opt_or_installed_prefix_keg)
recursive &&
!args.include_build? && @use_runtime_dependencies = installed && recursive &&
!args.include_test? && !args.include_build? &&
!args.include_optional? && !args.include_test? &&
!args.skip_recommended? !args.include_optional? &&
!args.skip_recommended?
if args.remaining.empty? if args.remaining.empty?
raise FormulaUnspecifiedError unless args.installed? raise FormulaUnspecifiedError unless args.installed?
@ -137,7 +138,7 @@ module Homebrew
def deps_for_formula(f, recursive = false) def deps_for_formula(f, recursive = false)
includes, ignores = argv_includes_ignores(ARGV) includes, ignores = argv_includes_ignores(ARGV)
deps = f.runtime_dependencies if @only_installed_arg deps = f.runtime_dependencies if @use_runtime_dependencies
if recursive if recursive
deps ||= recursive_includes(Dependency, f, includes, ignores) deps ||= recursive_includes(Dependency, f, includes, ignores)

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

@ -58,15 +58,16 @@ module Homebrew
ARGV.named.map { |name| OpenStruct.new name: name, full_name: name } ARGV.named.map { |name| OpenStruct.new name: name, full_name: name }
end end
only_installed_arg = args.installed? && use_runtime_dependents = args.installed? &&
!args.include_build? && !args.include_build? &&
!args.include_test? && !args.include_test? &&
!args.include_optional? && !args.include_optional? &&
!args.skip_recommended? !args.skip_recommended?
uses = if only_installed_arg && !used_formulae_missing uses = if use_runtime_dependents && !used_formulae_missing
used_formulae.map(&:runtime_installed_formula_dependents) used_formulae.map(&:runtime_installed_formula_dependents)
.reduce(&:&) .reduce(&:&)
.select(&:any_version_installed?)
else else
formulae = args.installed? ? Formula.installed : Formula formulae = args.installed? ? Formula.installed : Formula
recursive = args.recursive? recursive = args.recursive?