From 529f7b7953d75657ef996059bfe50cff40f90d00 Mon Sep 17 00:00:00 2001 From: Rylan Polster Date: Thu, 16 Nov 2023 11:47:48 -0500 Subject: [PATCH] Remove El Capitan system curl workaround --- Library/Homebrew/extend/os/mac/utils/curl.rb | 15 --------------- Library/Homebrew/extend/os/utils/curl.rb | 4 ---- Library/Homebrew/utils/curl.rb | 9 +-------- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 Library/Homebrew/extend/os/mac/utils/curl.rb delete mode 100644 Library/Homebrew/extend/os/utils/curl.rb diff --git a/Library/Homebrew/extend/os/mac/utils/curl.rb b/Library/Homebrew/extend/os/mac/utils/curl.rb deleted file mode 100644 index 56c7e56f51..0000000000 --- a/Library/Homebrew/extend/os/mac/utils/curl.rb +++ /dev/null @@ -1,15 +0,0 @@ -# typed: true -# frozen_string_literal: true - -module Utils - module Curl - undef return_value_for_empty_http_status_code - - def return_value_for_empty_http_status_code(url_type, url) - # Hack around https://github.com/Homebrew/brew/issues/3199 - return if MacOS.version == :el_capitan - - generic_return_value_for_empty_http_status_code url_type, url - end - end -end diff --git a/Library/Homebrew/extend/os/utils/curl.rb b/Library/Homebrew/extend/os/utils/curl.rb deleted file mode 100644 index fbd35e61e4..0000000000 --- a/Library/Homebrew/extend/os/utils/curl.rb +++ /dev/null @@ -1,4 +0,0 @@ -# typed: strict -# frozen_string_literal: true - -require "extend/os/mac/utils/curl" if OS.mac? diff --git a/Library/Homebrew/utils/curl.rb b/Library/Homebrew/utils/curl.rb index a1b1c1b44b..8973d43d3c 100644 --- a/Library/Homebrew/utils/curl.rb +++ b/Library/Homebrew/utils/curl.rb @@ -320,7 +320,7 @@ module Utils break if http_status_ok?(details[:status_code]) end - return return_value_for_empty_http_status_code(url_type, url) unless details[:status_code] + return "The #{url_type} #{url} is not reachable" unless details[:status_code] unless http_status_ok?(details[:status_code]) return if details[:responses].any? do |response| @@ -481,11 +481,6 @@ module Utils (100..299).cover?(status.to_i) end - def return_value_for_empty_http_status_code(url_type, url) - "The #{url_type} #{url} is not reachable" - end - alias generic_return_value_for_empty_http_status_code return_value_for_empty_http_status_code - # Separates the output text from `curl` into an array of HTTP responses and # the final response body (i.e. content). Response hashes contain the # `:status_code`, `:status_text`, and `:headers`. @@ -619,5 +614,3 @@ module Utils end end end - -require "extend/os/utils/curl"