From c969be340ea2b513296e35fc246d1b3d65550ce5 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 27 Jun 2023 14:33:23 +0100 Subject: [PATCH] download_strategy: move HOMEBREW_ARTIFACT_DOMAIN hack --- Library/Homebrew/download_strategy.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index 85ddf39366..78632ca56a 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -383,7 +383,6 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy attr_reader :mirrors def initialize(url, name, version, **meta) - super @try_partial = true @mirrors = meta.fetch(:mirrors, []) @@ -410,6 +409,10 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy begin url = urls.shift + if (domain = Homebrew::EnvConfig.artifact_domain) + url = url.sub(%r{^https?://#{GitHubPackages::URL_DOMAIN}/}o, "#{domain.chomp("/")}/") + end + ohai "Downloading #{url}" use_cached_location = cached_location.exist? @@ -477,10 +480,6 @@ class CurlDownloadStrategy < AbstractFileDownloadStrategy @resolved_info_cache ||= {} return @resolved_info_cache[url] if @resolved_info_cache.include?(url) - if (domain = Homebrew::EnvConfig.artifact_domain) - url = url.sub(%r{^https?://#{GitHubPackages::URL_DOMAIN}/}o, "#{domain.chomp("/")}/") - end - parsed_output = curl_headers(url.to_s, wanted_headers: ["content-disposition"], timeout: timeout) parsed_headers = parsed_output.fetch(:responses).map { |r| r.fetch(:headers) }