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

cmd/upgrade: fix pinned dependent handling.

Browse Source 
Ensure they aren't upgraded or reinstalled even if they are outdated.

Fixes #6898.
This commit is contained in:
Mike McQuaid 2020-01-07 19:33:33 +00:00
parent 33b4e08394
commit 45409618df
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,19 +226,21 @@ module Homebrew
return if formulae_to_install.empty? return if formulae_to_install.empty?
oh1 "Checking for dependents of upgraded formulae..." unless args.dry_run? oh1 "Checking for dependents of upgraded formulae..." unless args.dry_run?
dependents = outdated_dependents =
formulae_to_install.flat_map(&:runtime_installed_formula_dependents) formulae_to_install.flat_map(&:runtime_installed_formula_dependents)
if dependents.blank? .select(&:outdated?)
if outdated_dependents.blank?
ohai "No dependents found!" unless args.dry_run? ohai "No dependents found!" unless args.dry_run?
return return
end end
outdated_dependents -= formulae_to_install if args.dry_run?
upgradeable_dependents = dependents.select(&:outdated?) upgradeable_dependents =
.sort { |a, b| depends_on(a, b) } outdated_dependents.reject(&:pinned?)
upgradeable_dependents -= formulae_to_install if args.dry_run? .sort { |a, b| depends_on(a, b) }
pinned_dependents = dependents.select(&:pinned?) pinned_dependents =
.sort { |a, b| depends_on(a, b) } outdated_dependents.select(&:pinned?)
pinned_dependents -= formulae_to_install if args.dry_run? .sort { |a, b| depends_on(a, b) }
if pinned_dependents.present? if pinned_dependents.present?
plural = "dependent".pluralize(pinned_dependents.count) plural = "dependent".pluralize(pinned_dependents.count)
@ -291,18 +293,20 @@ module Homebrew
end end
reinstallable_broken_dependents = reinstallable_broken_dependents =
broken_dependents.select(&:outdated?) broken_dependents.reject(&:outdated?)
.reject(&:pinned?)
.sort { |a, b| depends_on(a, b) } .sort { |a, b| depends_on(a, b) }
pinned_broken_dependents = outdated_pinned_broken_dependents =
broken_dependents.select(&:pinned?) broken_dependents.select(&:outdated?)
.select(&:pinned?)
.sort { |a, b| depends_on(a, b) } .sort { |a, b| depends_on(a, b) }
# Print the pinned dependents. # Print the pinned dependents.
if pinned_broken_dependents.present? if outdated_pinned_broken_dependents.present?
count = pinned_broken_dependents.count count = outdated_pinned_broken_dependents.count
plural = "dependent".pluralize(pinned_broken_dependents.count) plural = "dependent".pluralize(outdated_pinned_broken_dependents.count)
onoe "Not reinstalling #{count} broken and outdated, but pinned #{plural}:" onoe "Not reinstalling #{count} broken and outdated, but pinned #{plural}:"
$stderr.puts(pinned_broken_dependents.map do |f| $stderr.puts(outdated_pinned_broken_dependents.map do |f|
"#{f.full_specified_name} #{f.pkg_version}" "#{f.full_specified_name} #{f.pkg_version}"
end.join(", ")) end.join(", "))
end end