From 2ee57d5ff159d09719d71a4d636ddbd69c1c7abd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 21 May 2017 14:29:00 +0000
Subject: remove verify option

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/downloader.rb | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'tool')

diff --git a/tool/downloader.rb b/tool/downloader.rb
index ba65f37871..9980230945 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -60,11 +60,8 @@ class Downloader
     def self.download(name, dir = nil, since = true, options = {})
       require 'rubygems'
       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__)))
-      super("https://rubygems.org/downloads/#{name}", name, dir, since, options) or
-        return false
-      return true unless verify
+      super("https://rubygems.org/downloads/#{name}", name, dir, since, options)
     end
   end
 
@@ -123,7 +120,6 @@ class Downloader
   #            'UnicodeData.txt', 'enc/unicode/data'
   def self.download(url, name, dir = nil, since = true, options = {})
     options = options.dup
-    options.delete(:verify)
     file = under(dir, name)
     dryrun = options.delete(:dryrun)
     if since.nil? and File.exist?(file)
@@ -189,10 +185,6 @@ class Downloader
     raise "failed to download #{name}\n#{e.message}: #{url}"
   end
 
-  def self.verify(file)
-    true
-  end
-
   def self.under(dir, name)
     dir ? File.join(dir, File.basename(name)) : name
   end
@@ -217,8 +209,6 @@ if $0 == __FILE__
       since = nil
     when '-a'
       since = false
-    when '-V'
-      options[:verify] = true
     when '-n', '--dryrun'
       options[:dryrun] = true
     when /\A-/
-- 
cgit v1.2.3