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

Merge pull request #14497 from Rylan12/fix-api-fallback

Browse Source 
Fix JSON file download failure fallback
This commit is contained in:
Mike McQuaid 2023-02-04 13:47:09 +01:00 committed by GitHub
commit 7b3756a29f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/api.rb
View File

@ -45,15 +45,17 @@ module Homebrew
curl_args.prepend("--time-cond", target) if target.exist? && !target.empty? curl_args.prepend("--time-cond", target) if target.exist? && !target.empty?
begin begin
# Disable retries here, we handle them ourselves below. begin
Utils::Curl.curl_download(*curl_args, to: target, max_time: JSON_API_MAX_TIME, retries: 0) # Disable retries here, we handle them ourselves below.
Utils::Curl.curl_download(*curl_args, to: target, max_time: JSON_API_MAX_TIME, retries: 0)
rescue ErrorDuringExecution
raise unless target.exist?
raise if target.empty?
opoo "#{target.basename}: update failed, falling back to cached version."
end
JSON.parse(target.read) JSON.parse(target.read)
rescue ErrorDuringExecution
raise unless target.exist?
raise if target.empty?
opoo "#{target.basename}: update failed, falling back to cached version."
rescue JSON::ParserError rescue JSON::ParserError
target.unlink target.unlink
retry_count += 1 retry_count += 1