From 967b9b811238c0750f16a6cea902379e5469f15d Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Wed, 12 Feb 2020 22:30:44 +0100 Subject: [PATCH] deps: give consistent results Co-Authored-By: Mike McQuaid --- Library/Homebrew/cmd/deps.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/cmd/deps.rb b/Library/Homebrew/cmd/deps.rb index b7f21155bd..ce40ddfbea 100644 --- a/Library/Homebrew/cmd/deps.rb +++ b/Library/Homebrew/cmd/deps.rb @@ -62,6 +62,13 @@ module Homebrew Formulary.enable_factory_cache! 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.installed? @@ -80,14 +87,6 @@ module Homebrew return 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? raise FormulaUnspecifiedError unless args.installed? @@ -176,7 +175,8 @@ module Homebrew def recursive_deps_tree(f, prefix, recursive) 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) dependables = reqs + deps