diff options
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 |