From e377bdb6fe872855142b18db654dae453b31edbe Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 2 Sep 2018 03:30:37 +0200 Subject: [PATCH] Fix `CurlApacheMirrorDownloadStrategy` URL resolution. --- Library/Homebrew/download_strategy.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index 619b490a00..98f6d47981 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -405,12 +405,15 @@ class CurlApacheMirrorDownloadStrategy < CurlDownloadStrategy private - def resolved_url_and_basename - return @resolved_url_and_basename if defined?(@resolved_url_and_basename) - @resolved_url_and_basename = [ - "#{apache_mirrors["preferred"]}#{apache_mirrors["path_info"]}", - File.basename(apache_mirrors["path_info"]), - ] + def resolve_url_and_basename(url) + if url == self.url + [ + "#{apache_mirrors["preferred"]}#{apache_mirrors["path_info"]}", + File.basename(apache_mirrors["path_info"]), + ] + else + super + end end def apache_mirrors