mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

audit: ensure curl always has an HTTP url.

Browse Source 
This makes using `HOMEBREW_CURL` significantly nicer as then the system
`curl` (that, on old versions, sucks at SSL) can download a version of
`curl` that it can build from source.
This commit is contained in:
Mike McQuaid 2017-06-07 16:52:05 +01:00
parent fd4aaf030f
commit cc8bc44286
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/dev-cmd/audit.rb
View File

@ -195,12 +195,12 @@ class FormulaAuditor
@specs = %w[stable devel head].map { |s| formula.send(s) }.compact @specs = %w[stable devel head].map { |s| formula.send(s) }.compact
end end
def self.check_http_content(url, user_agents: [:default]) def self.check_http_content(url, name, user_agents: [:default])
return unless url.start_with? "http" return unless url.start_with? "http"
details = nil details = nil
user_agent = nil user_agent = nil
hash_needed = url.start_with?("http:") hash_needed = url.start_with?("http:") && name != "curl"
user_agents.each do |ua| user_agents.each do |ua|
details = http_content_headers_and_checksum(url, hash_needed: hash_needed, user_agent: ua) details = http_content_headers_and_checksum(url, hash_needed: hash_needed, user_agent: ua)
user_agent = ua user_agent = ua
@ -597,6 +597,7 @@ class FormulaAuditor
return unless DevelopmentTools.curl_handles_most_https_homepages? return unless DevelopmentTools.curl_handles_most_https_homepages?
if http_content_problem = FormulaAuditor.check_http_content(homepage, if http_content_problem = FormulaAuditor.check_http_content(homepage,
formula.name,
user_agents: [:browser, :default]) user_agents: [:browser, :default])
problem http_content_problem problem http_content_problem
end end
@ -1497,6 +1498,10 @@ class ResourceAuditor
problem "#{u} should be `https://search.maven.org/remotecontent?filepath=#{$1}`" problem "#{u} should be `https://search.maven.org/remotecontent?filepath=#{$1}`"
end end
if name == "curl" && !urls.find { |u| u.start_with?("http://") }
problem "should always include at least one HTTP url"
end
# Check pypi urls # Check pypi urls
if @strict if @strict
urls.each do |p| urls.each do |p|
@ -1514,7 +1519,7 @@ class ResourceAuditor
# A `brew mirror`'ed URL is usually not yet reachable at the time of # A `brew mirror`'ed URL is usually not yet reachable at the time of
# pull request. # pull request.
next if url =~ %r{^https://dl.bintray.com/homebrew/mirror/} next if url =~ %r{^https://dl.bintray.com/homebrew/mirror/}
if http_content_problem = FormulaAuditor.check_http_content(url) if http_content_problem = FormulaAuditor.check_http_content(url, name)
problem http_content_problem problem http_content_problem
end end
elsif strategy <= GitDownloadStrategy elsif strategy <= GitDownloadStrategy