mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
38caab29bc
commit
67da45a1f3
3 changed files with 7 additions and 5 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -442,7 +442,7 @@ ERROR: Certificate is an invalid CA certificate
|
|||
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
|
||||
|
||||
|
|
Loading…
Reference in a new issue