diff options
Diffstat (limited to 'lib/rubygems/resolver.rb')
-rw-r--r-- | lib/rubygems/resolver.rb | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index 0a3276daab..50a547e1be 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -233,29 +233,8 @@ class Gem::Resolver exc.errors = @set.errors raise exc end - - sources = [] - - groups = Hash.new { |hash, key| hash[key] = [] } - - possibles.each do |spec| - source = spec.source - - sources << source unless sources.include? source - - groups[source] << spec - end - - activation_requests = [] - - sources.sort.each do |source| - groups[source]. - sort_by { |spec| [spec.version, Gem::Platform.local =~ spec.platform ? 1 : 0] }. - map { |spec| ActivationRequest.new spec, dependency, [] }. - each { |activation_request| activation_requests << activation_request } - end - - activation_requests + possibles.sort_by { |s| [s.source, s.version, Gem::Platform.local =~ s.platform ? 1 : 0] }. + map { |s| ActivationRequest.new s, dependency, [] } end def dependencies_for(specification) |