Permalink
Browse files

* lib/rubygems: Updated to RubyGems 1.8.24, a bugfix release.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent c4348fc commit 505c4eae3220b3af74c91d8b6af0c3f2480fb85e @drbrain drbrain committed Jul 24, 2012
Showing with 24 additions and 6 deletions.
  1. +4 −0 ChangeLog
  2. +1 −1 lib/rubygems.rb
  3. +4 −1 lib/rubygems/commands/setup_command.rb
  4. +15 −4 lib/rubygems/remote_fetcher.rb
View
4 ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 24 09:31:18 2012 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems: Updated to RubyGems 1.8.24, a bugfix release.
+
Tue Jul 24 08:30:15 2012 Luis Lavena <luislavena@gmail.com>
* test/ruby/test_dir_m17n.rb (create_and_check_raw_file_name): add new
View
2 lib/rubygems.rb
@@ -121,7 +121,7 @@ class << Gem
# -The RubyGems Team
module Gem
- VERSION = '1.8.23'
+ VERSION = '1.8.24'
##
# Raised when RubyGems is unable to load or activate a gem. Contains the
View
5 lib/rubygems/commands/setup_command.rb
@@ -209,7 +209,10 @@ def install_lib(lib_dir)
say "Installing RubyGems" if @verbose
Dir.chdir 'lib' do
- lib_files = Dir[File.join('**', '*rb')]
+ lib_files = Dir[File.join('**', '*rb')]
+
+ # Be sure to include our SSL ca bundles
+ lib_files += Dir[File.join('**', '*pem')]
lib_files.each do |lib_file|
dest_file = File.join lib_dir, lib_file
View
19 lib/rubygems/remote_fetcher.rb
@@ -321,13 +321,24 @@ def connection_for(uri)
if https?(uri) and !connection.started? then
configure_connection_for_https(connection)
- end
- connection.start unless connection.started?
+ # Don't refactor this with the else branch. We don't want the
+ # http-only code path to not depend on anything in OpenSSL.
+ #
+ begin
+ connection.start
+ rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
+ raise FetchError.new(e.message, uri)
+ end
+ else
+ begin
+ connection.start unless connection.started?
+ rescue Errno::EHOSTDOWN => e
+ raise FetchError.new(e.message, uri)
+ end
+ end
connection
- rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
- raise FetchError.new(e.message, uri)
end
def configure_connection_for_https(connection)

0 comments on commit 505c4ea

Please sign in to comment.