Merge pull request #20183 from tyuwags/correcting-Refine-ask‐option-dependency

Correcting refine ask option dependency
This commit is contained in:
Mike McQuaid 2025-06-27 08:05:34 +00:00 committed by GitHub
commit 53bb328cbc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 14 deletions

View File

@ -313,6 +313,19 @@ module Homebrew
skip_post_install: false, skip_post_install: false,
skip_link: 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 "#{fi.formula}: #{e}"
next
end
end
if dry_run if dry_run
if (formulae_name_to_install = formula_installers.map(&:name)) if (formulae_name_to_install = formula_installers.map(&:name))
ohai "Would install #{Utils.pluralize("formula", formulae_name_to_install.count, ohai "Would install #{Utils.pluralize("formula", formulae_name_to_install.count,
@ -327,18 +340,6 @@ module Homebrew
end end
formula_installers.each do |fi| 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) install_formula(fi)
Cleanup.install_formula_clean!(fi.formula) Cleanup.install_formula_clean!(fi.formula)
end end

View File

@ -390,8 +390,6 @@ module Homebrew
quiet:, quiet:,
verbose:, verbose:,
) )
puts "here", dependent_installers
puts "here", upgradeable
upgrade_formulae(dependent_installers, dry_run: dry_run, verbose: verbose) upgrade_formulae(dependent_installers, dry_run: dry_run, verbose: verbose)
end end