kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rbinstall.rb: load zlib earlier

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-01-17 00:00:53 +00:00
parent 84a4125471
commit 6327183361
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tool/rbinstall.rb
View file

@ -19,6 +19,11 @@ require 'optparse'
require 'optparse/shellwords' require 'optparse/shellwords'
require 'ostruct' require 'ostruct'
require 'rubygems' require 'rubygems'
begin
require "zlib"
rescue LoadError
$" << "zlib.rb"
end
STDOUT.sync = true STDOUT.sync = true
File.umask(0) File.umask(0)
@ -739,11 +744,6 @@ install?(:ext, :comm, :gem) do
prepare "bundle gems", gem_dir, directories prepare "bundle gems", gem_dir, directories
install_dir = with_destdir(gem_dir) install_dir = with_destdir(gem_dir)
installed_gems = {} installed_gems = {}
begin
require "zlib"
rescue LoadError
$" << "zlib.rb"
end
Gem::Specification.each_spec([srcdir+'/gems/*']) do |spec| Gem::Specification.each_spec([srcdir+'/gems/*']) do |spec|
ins = RbInstall::UnpackedInstaller.new(spec, ins = RbInstall::UnpackedInstaller.new(spec,
:install_dir => install_dir, :install_dir => install_dir,