Remove unneeded curl_openssl_or_deps invocation

This fixes a regression introduced in #5626 [1], which removed `curl_openssl_or_deps` and left a single call in the code.

[1]: https://github.com/Homebrew/brew/pull/5626
This commit is contained in:
Claudia 2019-01-28 08:10:37 +01:00
parent 76b3c3dbe2
commit c2bbd9df7e
No known key found for this signature in database
GPG Key ID: 246AC3C0F10BE51F
2 changed files with 3 additions and 3 deletions

View File

@ -1134,7 +1134,7 @@ module Homebrew
# pull request.
next if url =~ %r{^https://dl.bintray.com/homebrew/mirror/}
if http_content_problem = curl_check_http_content(url, require_http: curl_openssl_or_deps)
if http_content_problem = curl_check_http_content(url)
problem http_content_problem
end
elsif strategy <= GitDownloadStrategy

View File

@ -69,12 +69,12 @@ def curl_output(*args, **options)
print_stderr: false)
end
def curl_check_http_content(url, user_agents: [:default], check_content: false, strict: false, require_http: false)
def curl_check_http_content(url, user_agents: [:default], check_content: false, strict: false)
return unless url.start_with? "http"
details = nil
user_agent = nil
hash_needed = url.start_with?("http:") && !require_http
hash_needed = url.start_with?("http:")
user_agents.each do |ua|
details = curl_http_content_headers_and_checksum(url, hash_needed: hash_needed, user_agent: ua)
user_agent = ua