From 52d1d2cc3f420b356157aad5f91bb5149862110d Mon Sep 17 00:00:00 2001
From: ilovezfs <ilovezfs@icloud.com>
Date: Fri, 17 Mar 2017 08:31:49 -0700
Subject: [PATCH] upgrade: keg_only before non-keg_only formulae
Avoids unnecessary conflicts when a previously non-keg_only formula is
in the way by prioritizing keg_only before non-keg_only formulae.
This change is motivated by the upgrade of gnupg 2.0 to 2.1, since the
latter no longer depends on the gpg-agent formula, which, even if made
keg_only, still causes the link step to fail for 2.1, as gpg-agent's
non-keg version won't have been upgraded to the keg_only version at that
point (alphabetically gnupg precedes gpg-agent).
---
Library/Homebrew/cmd/upgrade.rb | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index cea77ad292..ed36b8f33a 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -75,6 +75,18 @@ module Homebrew
puts pinned.map { |f| "#{f.full_specified_name} #{f.pkg_version}" } * ", "
end
+ # Sort keg_only before non-keg_only formulae to avoid any needless conflicts
+ # with outdated, non-keg_only versions of formulae being upgraded.
+ formulae_to_install.sort! do |a, b|
+ if !a.keg_only? && b.keg_only?
+ 1
+ elsif a.keg_only? && !b.keg_only?
+ -1
+ else
+ 0
+ end
+ end
+
formulae_to_install.each do |f|
upgrade_formula(f)
next unless ARGV.include?("--cleanup")
--
GitLab