From 9e131d0794f6641d984357aa9c0ff8b5e076ebcc Mon Sep 17 00:00:00 2001 From: thibhero Date: Thu, 26 Jun 2025 19:12:39 -0400 Subject: [PATCH 1/3] correcting error of installation dependency resolves #20181 --- Library/Homebrew/install.rb | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 48b9acb362..14cdf23736 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -313,6 +313,19 @@ module Homebrew skip_post_install: false, skip_link: false ) + unless dry_run + formula_installers.each do |fi| + fi.prelude + fi.fetch + rescue CannotInstallFormulaError => e + ofail e.message + next + rescue UnsatisfiedRequirements, DownloadError, ChecksumMismatchError => e + ofail "#{formula}: #{e}" + next + end + end + if dry_run if (formulae_name_to_install = formula_installers.map(&:name)) ohai "Would install #{Utils.pluralize("formula", formulae_name_to_install.count, @@ -327,18 +340,6 @@ module Homebrew end formula_installers.each do |fi| - begin - unless dry_run - fi.prelude - fi.fetch - end - rescue CannotInstallFormulaError => e - ofail e.message - next - rescue UnsatisfiedRequirements, DownloadError, ChecksumMismatchError => e - ofail "#{formula}: #{e}" - next - end install_formula(fi) Cleanup.install_formula_clean!(fi.formula) end From f9dab1561ac1f4392e3aa903fd62990452a6ef68 Mon Sep 17 00:00:00 2001 From: thibhero Date: Thu, 26 Jun 2025 19:13:02 -0400 Subject: [PATCH 2/3] removing debugging symbol --- Library/Homebrew/upgrade.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index fa7bcf7c1f..f10f7e25cf 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -390,8 +390,6 @@ module Homebrew quiet:, verbose:, ) - puts "here", dependent_installers - puts "here", upgradeable upgrade_formulae(dependent_installers, dry_run: dry_run, verbose: verbose) end From e731b572f3730d5dc5e52273b27419654976ff15 Mon Sep 17 00:00:00 2001 From: thibhero Date: Fri, 27 Jun 2025 03:50:26 -0400 Subject: [PATCH 3/3] correcting rescue to use installer and not formula --- 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 14cdf23736..28dac7e823 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -321,7 +321,7 @@ module Homebrew ofail e.message next rescue UnsatisfiedRequirements, DownloadError, ChecksumMismatchError => e - ofail "#{formula}: #{e}" + ofail "#{fi.formula}: #{e}" next end end