summaryrefslogtreecommitdiff
path: root/lib/rubygems/config_file.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-13 19:58:57 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-09-13 19:58:57 +0000
commit1daa0b113d853bfa57b776cc569939b61ca14292 (patch)
treef8c4acb08a551820299dff2b13966d6ac38d31e4 /lib/rubygems/config_file.rb
parent85995e88d49c442b5b113c2676456133e79f5c02 (diff)
* lib/rubygems: Update to RubyGems 2.1.3
Fixed installing platform gems Restored concurrent requires Fixed installing gems with extensions with --install-dir Fixed `gem fetch -v` to install the latest version Fixed installing gems with "./" in their files entries * test/rubygems/test_gem_package.rb: Tests for the above. * NEWS: Updated for RubyGems 2.1.3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/config_file.rb')
-rw-r--r--lib/rubygems/config_file.rb17
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index d0699dcb29..244e845e6f 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -141,11 +141,6 @@ class Gem::ConfigFile
attr_reader :ssl_ca_cert
##
- # Path name of directory or file of openssl client certificate, used for remote https connection with client authentication
-
- attr_reader :ssl_client_cert
-
- ##
# Create the config file object. +args+ is the list of arguments
# from the command line.
#
@@ -215,7 +210,6 @@ class Gem::ConfigFile
@ssl_verify_mode = @hash[:ssl_verify_mode] if @hash.key? :ssl_verify_mode
@ssl_ca_cert = @hash[:ssl_ca_cert] if @hash.key? :ssl_ca_cert
- @ssl_client_cert = @hash[:ssl_client_cert] if @hash.key? :ssl_client_cert
@api_keys = nil
@rubygems_api_key = nil
@@ -252,10 +246,6 @@ Your gem push credentials file located at:
has file permissions of 0#{existing_permissions.to_s 8} but 0600 is required.
-To fix this error run:
-
-\tchmod 0600 #{credentials_path}
-
You should reset your credentials at:
\thttps://rubygems.org/profile/edit
@@ -319,9 +309,6 @@ if you believe they were disclosed to a third party.
@rubygems_api_key = api_key
end
- YAMLErrors = [ArgumentError]
- YAMLErrors << Psych::SyntaxError if defined?(Psych::SyntaxError)
-
def load_file(filename)
Gem.load_yaml
@@ -334,8 +321,8 @@ if you believe they were disclosed to a third party.
return {}
end
return content
- rescue *YAMLErrors => e
- warn "Failed to load #{filename}, #{e.to_s}"
+ rescue ArgumentError
+ warn "Failed to load #{filename}"
rescue Errno::EACCES
warn "Failed to load #{filename} due to permissions problem."
end