From 5a94c43b3f3003fcae58e2b88d29c140d12456b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?fn=20=E2=8C=83=20=E2=8C=A5?= <70830482+FnControlOption@users.noreply.github.com> Date: Mon, 13 Sep 2021 07:38:01 -0700 Subject: [PATCH] install, upgrade: fix installation attempt check --- Library/Homebrew/install.rb | 4 ---- Library/Homebrew/upgrade.rb | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/install.rb b/Library/Homebrew/install.rb index 5c563b4e46..a75ef25832 100644 --- a/Library/Homebrew/install.rb +++ b/Library/Homebrew/install.rb @@ -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) diff --git a/Library/Homebrew/upgrade.rb b/Library/Homebrew/upgrade.rb index 9f6f97de97..1d594e2df5 100644 --- a/Library/Homebrew/upgrade.rb +++ b/Library/Homebrew/upgrade.rb @@ -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