aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rubygems/config_file.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-05 22:40:53 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-05 22:40:53 +0000
commit7a88ad0a42dffdbbcaf0192635ab64c636294cf6 (patch)
tree932538cb8e039ea6005ab1f783da5d8c0e957338 /lib/rubygems/config_file.rb
parent32fa37f53c386bf8b6d9031a7c587772ee12430d (diff)
downloadruby-7a88ad0a42dffdbbcaf0192635ab64c636294cf6.tar.gz
* lib/rubygems/commands/query_command.rb: Only fetch remote specs when
showing details. [ruby-trunk - Bug #8019] RubyGems bug #487 * lib/rubygems/remote_fetcher.rb: ditto. * lib/rubygems/security/policy.rb: ditto. * test/rubygems/test_gem_commands_query_command.rb: Test for the above. * lib/rubygems/security.rb: Make OpenSSL optional for RubyGems. * lib/rubygems/commands/cert_command.rb: ditto. * lib/rubygems/config_file.rb: Display file with YAML error, not ~/.gemrc * lib/rubygems/remote_fetcher.rb: Only create gem subdirectories when installing gems. * lib/rubygems/dependency_resolver.rb: ditto. * lib/rubygems/test_utilities.rb: ditto. * test/rubygems/test_gem_commands_fetch_command.rb: Test for the above. * lib/rubygems/spec_fetcher.rb: Only try to upgrade http://rubygems.org to HTTPS * test/rubygems/test_gem_spec_fetcher.rb: Test for the above. * lib/rubygems.rb: Update win_platform? check for JRuby compatibility. * test/rubygems/test_gem_installer.rb: Update for Ruby 1.9.2 compatibility git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/config_file.rb')
-rw-r--r--lib/rubygems/config_file.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index 8d86dc5a3f..244e845e6f 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -317,14 +317,14 @@ if you believe they were disclosed to a third party.
begin
content = YAML.load(File.read(filename))
unless content.kind_of? Hash
- warn "Failed to load #{config_file_name} because it doesn't contain valid YAML hash"
+ warn "Failed to load #{filename} because it doesn't contain valid YAML hash"
return {}
end
return content
rescue ArgumentError
- warn "Failed to load #{config_file_name}"
+ warn "Failed to load #{filename}"
rescue Errno::EACCES
- warn "Failed to load #{config_file_name} due to permissions problem."
+ warn "Failed to load #{filename} due to permissions problem."
end
{}