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

upgrade: tweak dependent messaging.

Browse Source 
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.
This commit is contained in:
Mike McQuaid 2019-11-06 11:38:17 +00:00
parent 918224ce1a
commit 81e6359aeb
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cmd/upgrade.rb
View File

@ -223,10 +223,13 @@ module Homebrew
def check_dependents(formulae_to_install) def check_dependents(formulae_to_install)
return if formulae_to_install.empty? return if formulae_to_install.empty?
oh1 "Checking dependents for outdated formulae" if args.verbose? oh1 "Checking for dependents of upgraded formulae..."
dependents = dependents =
formulae_to_install.flat_map(&:runtime_installed_formula_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?) upgradeable_dependents = dependents.select(&:outdated?)
.sort { |a, b| depends_on(a, b) } .sort { |a, b| depends_on(a, b) }
@ -243,7 +246,7 @@ module Homebrew
# Print the upgradable dependents. # Print the upgradable dependents.
if upgradeable_dependents.blank? if upgradeable_dependents.blank?
ohai "No dependents to upgrade" if args.verbose? ohai "No outdated dependents to upgrade!"
else else
plural = "dependent".pluralize(upgradeable_dependents.count) plural = "dependent".pluralize(upgradeable_dependents.count)
ohai "Upgrading #{upgradable.count} #{plural}:" ohai "Upgrading #{upgradable.count} #{plural}:"
@ -261,7 +264,7 @@ module Homebrew
upgrade_formulae(upgradeable_dependents) upgrade_formulae(upgradeable_dependents)
# Assess the dependents tree again now we've upgraded. # 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| broken_dependents = CacheStoreDatabase.use(:linkage) do |db|
formulae_to_install.flat_map(&:runtime_installed_formula_dependents) formulae_to_install.flat_map(&:runtime_installed_formula_dependents)
.map(&:opt_or_installed_prefix_keg) .map(&:opt_or_installed_prefix_keg)
@ -271,7 +274,10 @@ module Homebrew
.broken_library_linkage? .broken_library_linkage?
end end
end end
return if broken_dependents.empty? if broken_dependents.blank?
ohai "No broken dependents found!"
return
end
reinstallable_broken_dependents = reinstallable_broken_dependents =
broken_dependents.select(&:outdated?) broken_dependents.select(&:outdated?)
@ -291,8 +297,8 @@ module Homebrew
end end
# Print the broken dependents. # Print the broken dependents.
if reinstallable_broken_dependents.empty? if reinstallable_broken_dependents.blank?
ohai "No broken dependents to reinstall" if args.verbose? ohai "No broken dependents to reinstall!"
else else
count = reinstallable_broken_dependents.count count = reinstallable_broken_dependents.count
plural = "dependent".pluralize(reinstallable_broken_dependents.count) plural = "dependent".pluralize(reinstallable_broken_dependents.count)