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

install, upgrade: fix installation attempt check

Browse Source
This commit is contained in:
fn ⌃ ⌥ 2021-09-13 07:38:01 -07:00
parent 9c03493774
commit 5a94c43b3f
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/install.rb
View File

@ -314,10 +314,6 @@ module Homebrew
def install_formula(formula_installer) def install_formula(formula_installer)
f = formula_installer.formula f = formula_installer.formula
formula_installer.check_installation_already_attempted
f.print_tap_action
upgrade = f.linked? && f.outdated? && !f.head? && !Homebrew::EnvConfig.no_install_upgrade? upgrade = f.linked? && f.outdated? && !f.head? && !Homebrew::EnvConfig.no_install_upgrade?
Upgrade.install_formula(formula_installer, upgrade: upgrade) Upgrade.install_formula(formula_installer, upgrade: upgrade)

6
Library/Homebrew/upgrade.rb
View File

@ -177,8 +177,6 @@ module Homebrew
return return
end end
formula_installer.check_installation_already_attempted
install_formula(formula_installer, upgrade: true) install_formula(formula_installer, upgrade: true)
rescue BuildError => e rescue BuildError => e
e.dump(verbose: verbose) e.dump(verbose: verbose)
@ -190,11 +188,15 @@ module Homebrew
def install_formula(formula_installer, upgrade:) def install_formula(formula_installer, upgrade:)
formula = formula_installer.formula formula = formula_installer.formula
formula_installer.check_installation_already_attempted
if upgrade if upgrade
print_upgrade_message(formula, formula_installer.options) print_upgrade_message(formula, formula_installer.options)
kegs = outdated_kegs(formula) kegs = outdated_kegs(formula)
linked_kegs = kegs.select(&:linked?) linked_kegs = kegs.select(&:linked?)
else
formula.print_tap_action
end end
# first we unlink the currently active keg for this formula otherwise it is # first we unlink the currently active keg for this formula otherwise it is