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

Merge pull request #12045 from FnControlOption/installation_already_attempted

Browse Source 
install, upgrade: fix installation attempt check
This commit is contained in:
Bo Anderson 2021-09-14 03:32:53 +01:00 committed by GitHub
commit 4a64d59141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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)
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.install_formula(formula_installer, upgrade: upgrade)

6
Library/Homebrew/upgrade.rb
View File

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