diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-15 08:24:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-15 08:24:39 +0000 |
| commit | a7f03a4659d34a459f915a41f260a1b9299ef219 (patch) | |
| tree | 67ae8a7fa3a5187e93602955ad5b91bd7322ca13 | |
| parent | 163c2994206805c3c717e8566878babf3621e994 (diff) | |
rbinstall.rb: respect DESTDIR
* lib/rubygems.rb (Gem.install): pass optinos to
Gem::DependencyInstaller.
* tool/rbinstall.rb (gem): respect DESTDIR.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rubygems.rb | 4 | ||||
| -rwxr-xr-x | tool/rbinstall.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems.rb b/lib/rubygems.rb index bc16daf9ee..9861362b97 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -544,9 +544,9 @@ module Gem # Fetching: minitest-3.0.1.gem (100%) # => [#<Gem::Specification:0x1013b4528 @name="minitest", ...>] - def self.install name, version = Gem::Requirement.default + def self.install name, version = Gem::Requirement.default, **options require "rubygems/dependency_installer" - inst = Gem::DependencyInstaller.new + inst = Gem::DependencyInstaller.new(**options) inst.install name, version inst.installed_gems end diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index c31902bc30..5e582f7bbf 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -721,7 +721,7 @@ install?(:ext, :comm, :gem) do directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) prepare "bundle gems", gem_dir, directories Dir.glob(srcdir+'/gems/*.gem').each do |gem| - Gem.install gem + Gem.install gem, install_dir: with_destdir(Gem.dir) gemname = Pathname(gem).basename puts "#{" "*30}#{gemname}" end |