diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 00:14:16 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-16 00:14:16 +0000 |
| commit | 28918eac58eb6e2681d10839ac0d1430b2a4f1f9 (patch) | |
| tree | 3c2c9e36118efe1d9406acdd14c186788879bea3 /lib/rubygems/dependency_installer.rb | |
| parent | cfe1458078b8cf36e490c516977c52e1faa9e88a (diff) | |
| download | ruby-28918eac58eb6e2681d10839ac0d1430b2a4f1f9.tar.gz | |
* lib/rubygems: Update to RubyGems master commit 2a74263. This fixes
several bugs in RubyGems 2.2.0.preview.1.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency_installer.rb')
| -rw-r--r-- | lib/rubygems/dependency_installer.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb index e7c489a759..8947e81d57 100644 --- a/lib/rubygems/dependency_installer.rb +++ b/lib/rubygems/dependency_installer.rb @@ -74,12 +74,6 @@ class Gem::DependencyInstaller @only_install_dir = !!options[:install_dir] @install_dir = options[:install_dir] || Gem.dir - if options[:install_dir] then - # HACK shouldn't change the global settings, needed for -i behavior - # maybe move to the install command? See also github #442 - Gem::Specification.dirs = @install_dir - end - options = DEFAULT_OPTIONS.merge options @bin_dir = options[:bin_dir] @@ -409,7 +403,9 @@ class Gem::DependencyInstaller request_set.soft_missing = true end - request_set.resolve Gem::DependencyResolver.compose_sets(as, installer_set) + composed_set = Gem::DependencyResolver.compose_sets as, installer_set + + request_set.resolve composed_set request_set end |