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

Merge pull request #7025 from dawidd6/deps-tree-consistent

Browse Source 
deps: give consistent results
This commit is contained in:
Mike McQuaid 2020-02-13 09:43:19 +00:00 committed by GitHub
commit 1b2bb2380e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,13 @@ module Homebrew
Formulary.enable_factory_cache! Formulary.enable_factory_cache!
recursive = !args.send("1?") recursive = !args.send("1?")
installed = args.installed? || ARGV.formulae.all?(&:opt_or_installed_prefix_keg)
@use_runtime_dependencies = installed && recursive &&
!args.include_build? &&
!args.include_test? &&
!args.include_optional? &&
!args.skip_recommended?
if args.tree? if args.tree?
if args.installed? if args.installed?
@ -80,14 +87,6 @@ module Homebrew
return return
end end
installed = args.installed? || ARGV.formulae.all?(&:opt_or_installed_prefix_keg)
@use_runtime_dependencies = installed && recursive &&
!args.include_build? &&
!args.include_test? &&
!args.include_optional? &&
!args.skip_recommended?
if Homebrew.args.remaining.empty? if Homebrew.args.remaining.empty?
raise FormulaUnspecifiedError unless args.installed? raise FormulaUnspecifiedError unless args.installed?
@ -176,7 +175,8 @@ module Homebrew
def recursive_deps_tree(f, prefix, recursive) def recursive_deps_tree(f, prefix, recursive)
includes, ignores = argv_includes_ignores(ARGV) includes, ignores = argv_includes_ignores(ARGV)
deps = reject_ignores(f.deps, ignores, includes) dependables = @use_runtime_dependencies ? f.runtime_dependencies : f.deps
deps = reject_ignores(dependables, ignores, includes)
reqs = reject_ignores(f.requirements, ignores, includes) reqs = reject_ignores(f.requirements, ignores, includes)
dependables = reqs + deps dependables = reqs + deps