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

upgrade: fetch_formula_installer -> create_formula_installer

Browse Source
This commit is contained in:
FnControlOption 2021-08-31 07:06:39 -07:00
parent f45c1146fc
commit 16594c5521
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Library/Homebrew/upgrade.rb
View File

@ -44,7 +44,7 @@ module Homebrew
formula_installers = formulae_to_install.map do |formula| formula_installers = formulae_to_install.map do |formula|
Migrator.migrate_if_needed(formula, force: force) Migrator.migrate_if_needed(formula, force: force)
begin begin
fetch_formula_installer( fi = create_formula_installer(
formula, formula,
flags: flags, flags: flags,
installed_on_request: installed_on_request, installed_on_request: installed_on_request,
@ -57,6 +57,8 @@ module Homebrew
quiet: quiet, quiet: quiet,
verbose: verbose, verbose: verbose,
) )
fi.fetch
fi
rescue UnsatisfiedRequirements, DownloadError => e rescue UnsatisfiedRequirements, DownloadError => e
ofail "#{formula}: #{e}" ofail "#{formula}: #{e}"
nil nil
@ -87,7 +89,7 @@ module Homebrew
EOS EOS
end end
def fetch_formula_installer( def create_formula_installer(
formula, formula,
flags:, flags:,
installed_on_request: false, installed_on_request: false,
@ -116,7 +118,7 @@ module Homebrew
options |= formula.build.used_options options |= formula.build.used_options
options &= formula.options options &= formula.options
fi = FormulaInstaller.new( FormulaInstaller.new(
formula, formula,
**{ **{
options: options, options: options,
@ -134,11 +136,8 @@ module Homebrew
verbose: verbose, verbose: verbose,
}.compact, }.compact,
) )
fi.fetch
fi
end end
private_class_method :fetch_formula_installer private_class_method :create_formula_installer
def upgrade_formula(formula_installer, verbose: false) def upgrade_formula(formula_installer, verbose: false)
formula = formula_installer.formula formula = formula_installer.formula