summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/rubygems.rb4
-rw-r--r--lib/rubygems/request.rb6
-rw-r--r--test/rubygems/test_gem_request.rb2
3 files changed, 7 insertions, 5 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
diff --git a/test/rubygems/test_gem_request.rb b/test/rubygems/test_gem_request.rb
index d816e91f62..1409acb23b 100644
--- a/test/rubygems/test_gem_request.rb
+++ b/test/rubygems/test_gem_request.rb
@@ -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