nobu	2015-01-17 09:00:53 +0900 (Sat, 17 Jan 2015)

  New Revision: 49287

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

  Log:
    rbinstall.rb: load zlib earlier
    
    * tool/rbinstall.rb: try to load zlib before using Gem::Installer,
      not to let LoadError raise during autoloading.

  Modified files:
    trunk/tool/rbinstall.rb
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 49286)
+++ tool/rbinstall.rb	(revision 49287)
@@ -19,6 +19,11 @@ require 'optparse' https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L19
 require 'optparse/shellwords'
 require 'ostruct'
 require 'rubygems'
+begin
+  require "zlib"
+rescue LoadError
+  $" << "zlib.rb"
+end
 
 STDOUT.sync = true
 File.umask(0)
@@ -739,11 +744,6 @@ install?(:ext, :comm, :gem) do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L744
   prepare "bundle gems", gem_dir, directories
   install_dir = with_destdir(gem_dir)
   installed_gems = {}
-  begin
-    require "zlib"
-  rescue LoadError
-    $" << "zlib.rb"
-  end
   Gem::Specification.each_spec([srcdir+'/gems/*']) do |spec|
     ins = RbInstall::UnpackedInstaller.new(spec,
                                            :install_dir => install_dir,

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