From dfab4bbab2e9b6562e37a9ebbb062b3b764f1315 Mon Sep 17 00:00:00 2001 From: thibhero Date: Sun, 29 Jun 2025 23:18:38 -0400 Subject: [PATCH 1/7] removing formula previously updated --- Library/Homebrew/upgrade.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index fa7bcf7c1f..67c05eea61 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -375,6 +375,8 @@ module Homebrew puts formulae_upgrades.join(", ") end + upgradeable = upgradeable.reject { |f| FormulaInstaller.installed.to_a.include?(f) } + unless dry_run dependent_installers = formula_installers( upgradeable, From c5036f3bba62f35b444a614190509b4cd4ebb838 Mon Sep 17 00:00:00 2001 From: thibhero Date: Sun, 29 Jun 2025 23:24:04 -0400 Subject: [PATCH 2/7] removing debugging symbols --- Library/Homebrew/upgrade.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 67c05eea61..7d52e6e068 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -392,8 +392,6 @@ module Homebrew quiet:, verbose:, ) - puts "here", dependent_installers - puts "here", upgradeable upgrade_formulae(dependent_installers, dry_run: dry_run, verbose: verbose) end From c7f7ab5631b9dd3f0fafaab1166727daa93f6d84 Mon Sep 17 00:00:00 2001 From: thibhero Date: Sun, 29 Jun 2025 23:29:18 -0400 Subject: [PATCH 3/7] duplicate in ask_formulae --- Library/Homebrew/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 48b9acb362..c0f04eb3ba 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -469,7 +469,7 @@ module Homebrew end.flat_map(&:to_formula)] end.flatten.uniq formulae_dependencies.concat(dependants.upgradeable) if dependants&.upgradeable - formulae_dependencies + formulae_dependencies.uniq end end end From e3cc36a8b901ff42c7702dafc2f21f71ff5a24d6 Mon Sep 17 00:00:00 2001 From: thibhero Date: Mon, 30 Jun 2025 10:57:41 -0400 Subject: [PATCH 4/7] guard if keg or linked is nil --- Library/Homebrew/reinstall.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb index 4d5ff2485c..3fedef937c 100644 --- a/Library/Homebrew/reinstall.rb +++ b/Library/Homebrew/reinstall.rb @@ -84,7 +84,7 @@ module Homebrew keg = install_context.keg formula = install_context.formula options = install_context.options - link_keg = keg.linked? + link_keg = keg.linked? if keg&.linked? || nil formula_installer.prelude formula_installer.fetch From 006d3779f3581df0ff9b2950cf58dd5b8390bc9e Mon Sep 17 00:00:00 2001 From: thibhero Date: Mon, 30 Jun 2025 10:58:33 -0400 Subject: [PATCH 5/7] returning early if upgradeable is blank resolves #20197 --- Library/Homebrew/upgrade.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 7d52e6e068..86f318d839 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -377,6 +377,8 @@ module Homebrew upgradeable = upgradeable.reject { |f| FormulaInstaller.installed.to_a.include?(f) } + return if upgradeable.blank? + unless dry_run dependent_installers = formula_installers( upgradeable, From a6aad3d12f530a87405607e38191cc45fd810c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20H=C3=A9rault?= <78233978+tyuwags@users.noreply.github.com> Date: Tue, 1 Jul 2025 09:59:54 -0400 Subject: [PATCH 6/7] Update Library/Homebrew/upgrade.rb Co-authored-by: Carlo Cabrera --- Library/Homebrew/upgrade.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 86f318d839..9bfbbd7c54 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -375,7 +375,7 @@ module Homebrew puts formulae_upgrades.join(", ") end - upgradeable = upgradeable.reject { |f| FormulaInstaller.installed.to_a.include?(f) } + upgradeable.reject! { |f| FormulaInstaller.installed.include?(f) } return if upgradeable.blank? From ea240e5aad01b7e73351b89a215463b3eb6fec18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibaut=20H=C3=A9rault?= <78233978+tyuwags@users.noreply.github.com> Date: Wed, 2 Jul 2025 15:43:24 -0400 Subject: [PATCH 7/7] Update Library/Homebrew/reinstall.rb Co-authored-by: Carlo Cabrera --- Library/Homebrew/reinstall.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/reinstall.rb b/Library/Homebrew/reinstall.rb index 3fedef937c..9c1e7563e5 100644 --- a/Library/Homebrew/reinstall.rb +++ b/Library/Homebrew/reinstall.rb @@ -84,7 +84,7 @@ module Homebrew keg = install_context.keg formula = install_context.formula options = install_context.options - link_keg = keg.linked? if keg&.linked? || nil + link_keg = keg&.linked? formula_installer.prelude formula_installer.fetch