admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #17829 from Homebrew/apache-attic

Browse Source 
download_strategy: fix handling of Apache projects moved to Attic
This commit is contained in:
Bo Anderson 2024-07-23 15:47:32 +01:00 committed by GitHub
commit feaa98f0bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/download_strategy.rb
View File

@ -646,15 +646,22 @@ class CurlApacheMirrorDownloadStrategy < CurlDownloadStrategy
def combined_mirrors
return @combined_mirrors if defined?(@combined_mirrors)
backup_mirrors = apache_mirrors.fetch("backup", [])
backup_mirrors = unless apache_mirrors["in_attic"]
apache_mirrors.fetch("backup", [])
.map { |mirror| "#{mirror}#{apache_mirrors["path_info"]}" }
end
@combined_mirrors = [*@mirrors, *backup_mirrors]
end
def resolve_url_basename_time_file_size(url, timeout: nil)
if url == self.url
super("#{apache_mirrors["preferred"]}#{apache_mirrors["path_info"]}", timeout:)
preferred = if apache_mirrors["in_attic"]
"https://archive.apache.org/dist/"
else
apache_mirrors["preferred"]
end
super("#{preferred}#{apache_mirrors["path_info"]}", timeout:)
else
super
end