hsbt	2018-11-03 21:31:51 +0900 (Sat, 03 Nov 2018)

  New Revision: 65517

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

  Log:
    Merge rubygems-3.0.0.beta2.
    
      * It enabled `USE_BUNDLER_FOR_GEMDEPS` for using gemdeps of rubygems.

  Modified files:
    trunk/lib/rubygems/request.rb
    trunk/lib/rubygems.rb
    trunk/test/rubygems/test_gem_request.rb
Index: test/rubygems/test_gem_request.rb
===================================================================
--- test/rubygems/test_gem_request.rb	(revision 65516)
+++ test/rubygems/test_gem_request.rb	(revision 65517)
@@ -442,7 +442,7 @@ ERROR:  Certificate  is an invalid CA ce https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_request.rb#L442
     message =
       Gem::Request.verify_certificate_message error_number, EXPIRED_CERT
 
-    assert_equal "You must add #{EXPIRED_CERT.issuer} to your local trusted store",
+    assert_equal "Cannot verify certificate issued by #{EXPIRED_CERT.issuer}",
                  message
   end
 
Index: lib/rubygems/request.rb
===================================================================
--- lib/rubygems/request.rb	(revision 65516)
+++ lib/rubygems/request.rb	(revision 65517)
@@ -117,9 +117,11 @@ class Gem::Request https://github.com/ruby/ruby/blob/trunk/lib/rubygems/request.rb#L117
       "Certificate #{cert.subject} has an invalid purpose"
     when OpenSSL::X509::V_ERR_SELF_SIGNED_CERT_IN_CHAIN then
       "Root certificate is not trusted (#{cert.subject})"
-    when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
-      OpenSSL::X509::V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE then
+    when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY then
       "You must add #{cert.issuer} to your local trusted store"
+    when
+      OpenSSL::X509::V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE then
+      "Cannot verify certificate issued by #{cert.issuer}"
     end
   end
 
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 65516)
+++ lib/rubygems.rb	(revision 65517)
@@ -9,7 +9,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L9
 require 'rbconfig'
 
 module Gem
-  VERSION = "3.0.0.beta1".freeze
+  VERSION = "3.0.0.beta2".freeze
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -175,7 +175,7 @@ module Gem https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L175
     write_binary_errors
   end.freeze
 
-  USE_BUNDLER_FOR_GEMDEPS = false # :nodoc:
+  USE_BUNDLER_FOR_GEMDEPS = !ENV['DONT_USE_BUNDLER_FOR_GEMDEPS'] # :nodoc:
 
   @@win_platform = nil
 

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