diff options
Diffstat (limited to 'lib/rubygems/request_set.rb')
-rw-r--r-- | lib/rubygems/request_set.rb | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index d91a39cb22..d6337e32d8 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -166,29 +166,22 @@ class Gem::RequestSet installed = [] - sorted_requests.each do |req| - if existing.find { |s| s.full_name == req.spec.full_name } - yield req, nil if block_given? - next - end + options[:install_dir] = dir + options[:only_install_dir] = true - path = req.download(dir) + sorted_requests.each do |request| + spec = request.spec - unless path then # already installed - yield req, nil if block_given? + if existing.find { |s| s.full_name == spec.full_name } then + yield request, nil if block_given? next end - options[:install_dir] = dir - options[:only_install_dir] = true - - inst = Gem::Installer.new path, options - - yield req, inst if block_given? - - inst.install + spec.install options do |installer| + yield request, installer if block_given? + end - installed << req + installed << request end installed |