[前][次][番号順一覧][スレッド一覧]

ruby-changes:46717

From: nobu <ko1@a...>
Date: Sun, 21 May 2017 23:29:07 +0900 (JST)
Subject: [ruby-changes:46717] nobu:r58832 (trunk): remove verify option

nobu	2017-05-21 23:29:00 +0900 (Sun, 21 May 2017)

  New Revision: 58832

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58832

  Log:
    remove verify option

  Modified files:
    trunk/tool/downloader.rb
Index: tool/downloader.rb
===================================================================
--- tool/downloader.rb	(revision 58831)
+++ tool/downloader.rb	(revision 58832)
@@ -60,11 +60,8 @@ class Downloader https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L60
     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 https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L120
   #            '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 https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L185
     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__ https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L209
       since = nil
     when '-a'
       since = false
-    when '-V'
-      options[:verify] = true
     when '-n', '--dryrun'
       options[:dryrun] = true
     when /\A-/

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]