diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-03 12:31:51 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-11-03 12:31:51 +0000 |
commit | 67da45a1f3e660bcd37c67dd3794643da5035cb1 (patch) | |
tree | 42fed908116bbef3af970cadf917c174c54a74e4 /lib | |
parent | 38caab29bc759be2694013fc3930116e64fcc1d4 (diff) |
Merge rubygems-3.0.0.beta2.
* It enabled `USE_BUNDLER_FOR_GEMDEPS` for using gemdeps of rubygems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems.rb | 4 | ||||
-rw-r--r-- | lib/rubygems/request.rb | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 6557256469..d725d9f9dd 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -9,7 +9,7 @@ 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 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 diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb index d8d5d1bc31..b6674281d1 100644 --- a/lib/rubygems/request.rb +++ b/lib/rubygems/request.rb @@ -117,9 +117,11 @@ class Gem::Request "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 |