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

ruby-changes:51766

From: duerst <ko1@a...>
Date: Mon, 16 Jul 2018 19:20:30 +0900 (JST)
Subject: [ruby-changes:51766] duerst:r63978 (trunk): tool/downloader.rb:

duerst	2018-07-16 19:20:24 +0900 (Mon, 16 Jul 2018)

  New Revision: 63978

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

  Log:
    tool/downloader.rb:
    
    * remove initial "./" from destdir to make downloading
      ./enc/unicode/data/11.0.0/ucd/auxiliary/GraphemeBreakProperty.txt
      work properly
    * tweak a comment

  Modified files:
    trunk/tool/downloader.rb
Index: tool/downloader.rb
===================================================================
--- tool/downloader.rb	(revision 63977)
+++ tool/downloader.rb	(revision 63978)
@@ -11,8 +11,8 @@ rescue LoadError https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L11
 else
   https = 'https'
 
-  # open-uri of ruby 2.2.0 accept an array of PEMs as ssl_ca_cert, but old
-  # versions are not.  so, patching OpenSSL::X509::Store#add_file instead.
+  # open-uri of ruby 2.2.0 accepts an array of PEMs as ssl_ca_cert, but old
+  # versions do not.  so, patching OpenSSL::X509::Store#add_file instead.
   class OpenSSL::X509::Store
     alias orig_add_file add_file
     def add_file(pems)
@@ -329,8 +329,9 @@ if $0 == __FILE__ https://github.com/ruby/ruby/blob/trunk/tool/downloader.rb#L329
       dir = destdir
       if prefix
         name = name.sub(/\A\.\//, '')
-        if name.start_with?(destdir+"/")
-          name = name[(destdir.size+1)..-1]
+        destdir2 = destdir.sub(/\A\.\//, '')
+        if name.start_with?(destdir2+"/")
+          name = name[(destdir2.size+1)..-1]
           if (dir = File.dirname(name)) == '.'
             dir = destdir
           else

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

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