drbrain	2012-07-24 09:31:31 +0900 (Tue, 24 Jul 2012)

  New Revision: 36510

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36510

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

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/commands/setup_command.rb
    trunk/lib/rubygems/remote_fetcher.rb
    trunk/lib/rubygems.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36509)
+++ ChangeLog	(revision 36510)
@@ -1,3 +1,7 @@
+Tue Jul 24 09:31:18 2012  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems:  Updated to RubyGems 1.8.24, a bugfix release.
+
 Tue Jul 24 08:30:15 2012  Luis Lavena  <luislavena@g...>
 
 	* test/ruby/test_dir_m17n.rb (create_and_check_raw_file_name): add new
Index: lib/rubygems/remote_fetcher.rb
===================================================================
--- lib/rubygems/remote_fetcher.rb	(revision 36509)
+++ lib/rubygems/remote_fetcher.rb	(revision 36510)
@@ -321,13 +321,24 @@
 
     if https?(uri) and !connection.started? then
       configure_connection_for_https(connection)
+
+      # 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.start unless connection.started?
-
     connection
-  rescue OpenSSL::SSL::SSLError, Errno::EHOSTDOWN => e
-    raise FetchError.new(e.message, uri)
   end
 
   def configure_connection_for_https(connection)
Index: lib/rubygems/commands/setup_command.rb
===================================================================
--- lib/rubygems/commands/setup_command.rb	(revision 36509)
+++ lib/rubygems/commands/setup_command.rb	(revision 36510)
@@ -209,8 +209,11 @@
     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
         dest_dir = File.dirname dest_file
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 36509)
+++ lib/rubygems.rb	(revision 36510)
@@ -121,7 +121,7 @@
 # -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/