kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Merge rubygems-3.0.0.beta2.

Browse source 
* 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:
hsbt 2018-11-03 12:31:51 +00:00
parent 38caab29bc
commit 67da45a1f3
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/rubygems.rb
View file

@ -9,7 +9,7 @@
require 'rbconfig' require 'rbconfig'
module Gem module Gem
VERSION = "3.0.0.beta1".freeze VERSION = "3.0.0.beta2".freeze
end end
# Must be first since it unloads the prelude from 1.9.2 # Must be first since it unloads the prelude from 1.9.2
@ -175,7 +175,7 @@ module Gem
write_binary_errors write_binary_errors
end.freeze end.freeze
USE_BUNDLER_FOR_GEMDEPS = false # :nodoc: USE_BUNDLER_FOR_GEMDEPS = !ENV['DONT_USE_BUNDLER_FOR_GEMDEPS'] # :nodoc:
@@win_platform = nil @@win_platform = nil

6
lib/rubygems/request.rb
View file

@ -117,9 +117,11 @@ class Gem::Request
"Certificate #{cert.subject} has an invalid purpose" "Certificate #{cert.subject} has an invalid purpose"
when OpenSSL::X509::V_ERR_SELF_SIGNED_CERT_IN_CHAIN then when OpenSSL::X509::V_ERR_SELF_SIGNED_CERT_IN_CHAIN then
"Root certificate is not trusted (#{cert.subject})" "Root certificate is not trusted (#{cert.subject})"
when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, when OpenSSL::X509::V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY then
OpenSSL::X509::V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE then
"You must add #{cert.issuer} to your local trusted store" "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
end end

2
test/rubygems/test_gem_request.rb
View file

@ -442,7 +442,7 @@ ERROR: Certificate is an invalid CA certificate
message = message =
Gem::Request.verify_certificate_message error_number, EXPIRED_CERT 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 message
end end