diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-24 00:31:31 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-24 00:31:31 +0000 |
| commit | 505c4eae3220b3af74c91d8b6af0c3f2480fb85e (patch) | |
| tree | cac35fdee77cadecd68155f8320fd72652724692 /lib | |
| parent | c4348fcd7f6742337d8b2187d8c23182e5a6973d (diff) | |
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/commands/setup_command.rb | 5 | ||||
| -rw-r--r-- | lib/rubygems/remote_fetcher.rb | 19 |
3 files changed, 20 insertions, 6 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 7ed27461bb..d3a1f7c7b5 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -121,7 +121,7 @@ require "rubygems/deprecate" # -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 diff --git a/lib/rubygems/commands/setup_command.rb b/lib/rubygems/commands/setup_command.rb index 0c957393d9..508ff84a0f 100644 --- a/lib/rubygems/commands/setup_command.rb +++ b/lib/rubygems/commands/setup_command.rb @@ -209,7 +209,10 @@ TEXT 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 diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb index 6650711235..37699d17fc 100644 --- a/lib/rubygems/remote_fetcher.rb +++ b/lib/rubygems/remote_fetcher.rb @@ -321,13 +321,24 @@ class Gem::RemoteFetcher 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) |