From 5f4d4fb3fbfd1d52855c17468cca129fcc9a2bbf Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Sun, 31 Oct 2021 00:27:05 -0400 Subject: [PATCH] Cleanup --- Library/Homebrew/formula_installer.rb | 2 +- Library/Homebrew/formulary.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 51dc58f2d4..cab34ccc8c 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -218,7 +218,7 @@ class FormulaInstaller Homebrew::API::Bottle.fetch_bottles(e.name) retry rescue TapFormulaUnavailableError => e - raise if e.tap.installed? || e.tap.core_tap? + raise if e.tap.installed? e.tap.install retry diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 768e49bb7e..2e40aba574 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -343,7 +343,9 @@ module Formulary rescue FormulaClassUnavailableError => e raise TapFormulaClassUnavailableError.new(tap, name, e.path, e.class_name, e.class_list), "", e.backtrace rescue FormulaUnavailableError => e - raise CoreTapFormulaUnavailableError.new(name), "", e.backtrace if tap.core_tap? + if tap.core_tap? && Homebrew::EnvConfig.install_from_api? + raise CoreTapFormulaUnavailableError.new(name), "", e.backtrace + end raise TapFormulaUnavailableError.new(tap, name), "", e.backtrace end