1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove verify option

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-05-21 14:29:00 +00:00
parent 70b9957689
commit 2ee57d5ff1
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tool/downloader.rb
View File

@ -60,11 +60,8 @@ class Downloader
def self.download(name, dir = nil, since = true, options = {}) def self.download(name, dir = nil, since = true, options = {})
require 'rubygems' require 'rubygems'
options = options.dup options = options.dup
verify = options.delete(:verify) {Gem::VERSION >= "2.4."}
options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/**/*.pem", File.dirname(__FILE__))) options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/**/*.pem", File.dirname(__FILE__)))
super("https://rubygems.org/downloads/#{name}", name, dir, since, options) or super("https://rubygems.org/downloads/#{name}", name, dir, since, options)
return false
return true unless verify
end end
end end
@ -123,7 +120,6 @@ class Downloader
# 'UnicodeData.txt', 'enc/unicode/data' # 'UnicodeData.txt', 'enc/unicode/data'
def self.download(url, name, dir = nil, since = true, options = {}) def self.download(url, name, dir = nil, since = true, options = {})
options = options.dup options = options.dup
options.delete(:verify)
file = under(dir, name) file = under(dir, name)
dryrun = options.delete(:dryrun) dryrun = options.delete(:dryrun)
if since.nil? and File.exist?(file) if since.nil? and File.exist?(file)
@ -189,10 +185,6 @@ class Downloader
raise "failed to download #{name}\n#{e.message}: #{url}" raise "failed to download #{name}\n#{e.message}: #{url}"
end end
def self.verify(file)
true
end
def self.under(dir, name) def self.under(dir, name)
dir ? File.join(dir, File.basename(name)) : name dir ? File.join(dir, File.basename(name)) : name
end end
@ -217,8 +209,6 @@ if $0 == __FILE__
since = nil since = nil
when '-a' when '-a'
since = false since = false
when '-V'
options[:verify] = true
when '-n', '--dryrun' when '-n', '--dryrun'
options[:dryrun] = true options[:dryrun] = true
when /\A-/ when /\A-/