diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index ec0c4ca6f2..4a93db4044 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -336,24 +336,24 @@ module Homebrew skip_link: args.skip_link?, ) - if args.ask? - dependants = Upgrade.dependants( - installed_formulae, - flags: args.flags_only, - ask: args.ask?, - installed_on_request: !args.as_dependency?, - force_bottle: args.force_bottle?, - build_from_source_formulae: args.build_from_source_formulae, - interactive: args.interactive?, - keep_tmp: args.keep_tmp?, - debug_symbols: args.debug_symbols?, - force: args.force?, - debug: args.debug?, - quiet: args.quiet?, - verbose: args.verbose?, - dry_run: args.dry_run?, - ) + dependants = Upgrade.dependants( + installed_formulae, + flags: args.flags_only, + ask: args.ask?, + installed_on_request: !args.as_dependency?, + force_bottle: args.force_bottle?, + build_from_source_formulae: args.build_from_source_formulae, + interactive: args.interactive?, + keep_tmp: args.keep_tmp?, + debug_symbols: args.debug_symbols?, + force: args.force?, + debug: args.debug?, + quiet: args.quiet?, + verbose: args.verbose?, + dry_run: args.dry_run?, + ) + if args.ask? formulae_dependencies = Install.collect_dependencies(formulae_installer, dependants) # Main block: if asking the user is enabled, show dependency and size information. Install.ask_formulae(formulae_dependencies, args: args) @@ -363,24 +363,6 @@ module Homebrew dry_run: args.dry_run?, verbose: args.verbose?) - unless args.ask? - dependants = Upgrade.dependants( - installed_formulae, - flags: args.flags_only, - dry_run: args.dry_run?, - installed_on_request: !args.as_dependency?, - force_bottle: args.force_bottle?, - build_from_source_formulae: args.build_from_source_formulae, - interactive: args.interactive?, - keep_tmp: args.keep_tmp?, - debug_symbols: args.debug_symbols?, - force: args.force?, - debug: args.debug?, - quiet: args.quiet?, - verbose: args.verbose?, - ) - end - if dependants.present? Upgrade.upgrade_dependents( dependants, installed_formulae, diff --git a/Library/Homebrew/cmd/reinstall.rb b/Library/Homebrew/cmd/reinstall.rb index 7a65ea3251..3aff30f285 100644 --- a/Library/Homebrew/cmd/reinstall.rb +++ b/Library/Homebrew/cmd/reinstall.rb @@ -152,28 +152,28 @@ module Homebrew ) end - if args.ask? - dependants = Upgrade.dependants( - formulae, - flags: args.flags_only, - ask: args.ask?, - force_bottle: args.force_bottle?, - build_from_source_formulae: args.build_from_source_formulae, - interactive: args.interactive?, - keep_tmp: args.keep_tmp?, - debug_symbols: args.debug_symbols?, - force: args.force?, - debug: args.debug?, - quiet: args.quiet?, - verbose: args.verbose?, - ) + dependants = Upgrade.dependants( + formulae, + flags: args.flags_only, + ask: args.ask?, + force_bottle: args.force_bottle?, + build_from_source_formulae: args.build_from_source_formulae, + interactive: args.interactive?, + keep_tmp: args.keep_tmp?, + debug_symbols: args.debug_symbols?, + force: args.force?, + debug: args.debug?, + quiet: args.quiet?, + verbose: args.verbose?, + ) - formulae_installer = formulae_kegs.map(&:formula_installer) + formulae_installer = formulae_kegs.map(&:formula_installer) + + if args.ask? formulae_dependencies = Install.collect_dependencies(formulae_installer, dependants) # Main block: if asking the user is enabled, show dependency and size information. Install.ask_formulae(formulae_dependencies, args: args) - end formulae_kegs.each do |f| @@ -194,22 +194,6 @@ module Homebrew Cleanup.install_formula_clean!(f.formula) end - unless args.ask? - dependants = Upgrade.dependants( - formulae, - flags: args.flags_only, - force_bottle: args.force_bottle?, - build_from_source_formulae: args.build_from_source_formulae, - interactive: args.interactive?, - keep_tmp: args.keep_tmp?, - debug_symbols: args.debug_symbols?, - force: args.force?, - debug: args.debug?, - quiet: args.quiet?, - verbose: args.verbose?, - ) - end - if dependants.present? Upgrade.upgrade_dependents( dependants, formulae,