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

Merge pull request #6290 from lembacon/bottle_publisher-bottle_info

Browse Source 
bottle_publisher: fix bottle info accessor
This commit is contained in:
Michka Popoff 2019-07-10 22:24:52 +02:00 committed by GitHub
commit 74920d9666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/bottle_publisher.rb
View File

@ -107,14 +107,14 @@ class BottlePublisher
# Poll for publication completion using a quick partial HEAD, to avoid spurious error messages # Poll for publication completion using a quick partial HEAD, to avoid spurious error messages
# 401 error is normal while file is still in async publishing process # 401 error is normal while file is still in async publishing process
url = URI(bottle_info.url) url = URI(bottle_info["url"])
puts "Verifying bottle: #{File.basename(url.path)}" puts "Verifying bottle: #{File.basename(url.path)}"
http = Net::HTTP.new(url.host, url.port) http = Net::HTTP.new(url.host, url.port)
http.use_ssl = true http.use_ssl = true
retry_count = 0 retry_count = 0
http.start do http.start do
loop do loop do
req = Net::HTTP::Head.new bottle_info.url req = Net::HTTP::Head.new url
req.initialize_http_header "User-Agent" => HOMEBREW_USER_AGENT_RUBY req.initialize_http_header "User-Agent" => HOMEBREW_USER_AGENT_RUBY
res = http.request req res = http.request req
break if res.is_a?(Net::HTTPSuccess) || res.code == "302" break if res.is_a?(Net::HTTPSuccess) || res.code == "302"
@ -154,7 +154,7 @@ class BottlePublisher
retry_count += 1 retry_count += 1
end end
end end
checksum = Checksum.new(:sha256, bottle_info.sha256) checksum = Checksum.new(:sha256, bottle_info["sha256"])
Pathname.new(filename).verify_checksum(checksum) Pathname.new(filename).verify_checksum(checksum)
end end
end end