From 81e6359aeb55834eb44944a6a18ad8a61a74f502 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Wed, 6 Nov 2019 11:38:17 +0000 Subject: [PATCH] upgrade: tweak dependent messaging. Output more without requiring `--verbose` and update the messages to make clear what we're looking for and what we found/didn't find. This is a little more noisy but it should help explain any delays to users and make it more obvious what's failed if something does. --- Library/Homebrew/cmd/upgrade.rb | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 8eb77487a8..10bfc18ba8 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -223,10 +223,13 @@ module Homebrew def check_dependents(formulae_to_install) return if formulae_to_install.empty? - oh1 "Checking dependents for outdated formulae" if args.verbose? + oh1 "Checking for dependents of upgraded formulae..." dependents = formulae_to_install.flat_map(&:runtime_installed_formula_dependents) - return if dependents.empty? + if dependents.blank? + ohai "No dependents found!" + return + end upgradeable_dependents = dependents.select(&:outdated?) .sort { |a, b| depends_on(a, b) } @@ -243,7 +246,7 @@ module Homebrew # Print the upgradable dependents. if upgradeable_dependents.blank? - ohai "No dependents to upgrade" if args.verbose? + ohai "No outdated dependents to upgrade!" else plural = "dependent".pluralize(upgradeable_dependents.count) ohai "Upgrading #{upgradable.count} #{plural}:" @@ -261,7 +264,7 @@ module Homebrew upgrade_formulae(upgradeable_dependents) # Assess the dependents tree again now we've upgraded. - oh1 "Checking dependents for broken library links" if args.verbose? + oh1 "Checking for dependents' broken linkage from upgraded formulae..." broken_dependents = CacheStoreDatabase.use(:linkage) do |db| formulae_to_install.flat_map(&:runtime_installed_formula_dependents) .map(&:opt_or_installed_prefix_keg) @@ -271,7 +274,10 @@ module Homebrew .broken_library_linkage? end end - return if broken_dependents.empty? + if broken_dependents.blank? + ohai "No broken dependents found!" + return + end reinstallable_broken_dependents = broken_dependents.select(&:outdated?) @@ -291,8 +297,8 @@ module Homebrew end # Print the broken dependents. - if reinstallable_broken_dependents.empty? - ohai "No broken dependents to reinstall" if args.verbose? + if reinstallable_broken_dependents.blank? + ohai "No broken dependents to reinstall!" else count = reinstallable_broken_dependents.count plural = "dependent".pluralize(reinstallable_broken_dependents.count)