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

Merge pull request #13126 from EricFromCanada/bump-repology-check

Browse Source 
bump: resume checking for TLS 1.3 support
This commit is contained in:
Mike McQuaid 2022-04-12 10:11:02 +01:00 committed by GitHub
commit 8ba4674ed2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/dev-cmd/bump.rb
View File

@ -59,12 +59,14 @@ module Homebrew
limit = args.limit.to_i if args.limit.present? limit = args.limit.to_i if args.limit.present?
begin unless Utils::Curl.curl_supports_tls13?
unless Pathname.new(ENV["HOMEBREW_BREWED_CURL_PATH"]).exist? begin
ensure_formula_installed!("curl", reason: "Repology queries") unless Pathname.new(ENV["HOMEBREW_BREWED_CURL_PATH"]).exist?
ensure_formula_installed!("curl", reason: "Repology queries")
end
rescue FormulaUnavailableError
opoo "A newer `curl` is required for Repology queries."
end end
rescue FormulaUnavailableError
opoo "A newer `curl` is required for Repology queries."
end end
if formulae_and_casks.present? if formulae_and_casks.present?

4
Library/Homebrew/utils/repology.rb
View File

@ -19,7 +19,7 @@ module Repology
last_package_in_response += "/" if last_package_in_response.present? last_package_in_response += "/" if last_package_in_response.present?
url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=#{repository}&outdated=1" url = "https://repology.org/api/v1/projects/#{last_package_in_response}?inrepo=#{repository}&outdated=1"
output, errors, = curl_output(url.to_s, "--silent", use_homebrew_curl: false) output, errors, = curl_output(url.to_s, "--silent", use_homebrew_curl: !curl_supports_tls13?)
JSON.parse(output) JSON.parse(output)
rescue rescue
if Homebrew::EnvConfig.developer? if Homebrew::EnvConfig.developer?
@ -35,7 +35,7 @@ module Repology
url = "https://repology.org/tools/project-by?repo=#{repository}&" \ url = "https://repology.org/tools/project-by?repo=#{repository}&" \
"name_type=srcname&target_page=api_v1_project&name=#{name}" "name_type=srcname&target_page=api_v1_project&name=#{name}"
output, errors, = curl_output("--location", "--silent", url.to_s, use_homebrew_curl: true) output, errors, = curl_output("--location", "--silent", url.to_s, use_homebrew_curl: !curl_supports_tls13?)
data = JSON.parse(output) data = JSON.parse(output)
{ name => data } { name => data }