From 1656d08629b3582f2593c478a157f16eb62eca67 Mon Sep 17 00:00:00 2001 From: Carlo Cabrera <30379873+carlocab@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:51:27 +0800 Subject: [PATCH] os/linux/ld: drop `retry` logic This is a hack, so let's see if we can get away with skipping it for now. --- Library/Homebrew/os/linux/ld.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Library/Homebrew/os/linux/ld.rb b/Library/Homebrew/os/linux/ld.rb index dbc92de72d..9227792b29 100644 --- a/Library/Homebrew/os/linux/ld.rb +++ b/Library/Homebrew/os/linux/ld.rb @@ -7,7 +7,7 @@ module OS module Ld sig { returns(String) } def self.brewed_ld_so_diagnostics - @brewed_ld_so_diagnostics ||= T.let({}, T.nilable(T::Hash[Pathname, T.nilable(String)])) + @brewed_ld_so_diagnostics ||= T.let({}, T.nilable(T::Hash[Pathname, String])) brewed_ld_so = HOMEBREW_PREFIX/"lib/ld.so" return "" unless brewed_ld_so.exist? @@ -19,17 +19,6 @@ module OS end @brewed_ld_so_diagnostics[brewed_ld_so_target].to_s - rescue TypeError - # Workaround for intermittent `Error: no implicit conversion of false into String` - # https://github.com/Homebrew/brew/issues/17828 - unless @retried_brewed_ld_so_diagnostics&.fetch(brewed_ld_so_target, false) - @retried_brewed_ld_so_diagnostics ||= T.let({}, T.nilable(T::Hash[Pathname, T::Boolean])) - @retried_brewed_ld_so_diagnostics[brewed_ld_so_target] = true - sleep 0.5 - retry - end - - raise end sig { returns(String) }