From 7fbb9078fe61104606a40e4e450a2cd1a33f8ca1 Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 28 Mar 2016 02:26:39 +0000 Subject: * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.2. Please see entries of 2.6.2 on https://github.com/rubygems/rubygems/blob/master/History.txt git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/resolver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/rubygems/resolver.rb') diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb index 3a406d0444..50a547e1be 100644 --- a/lib/rubygems/resolver.rb +++ b/lib/rubygems/resolver.rb @@ -193,7 +193,7 @@ class Gem::Resolver conflict = e.conflicts.values.first raise Gem::DependencyResolutionError, Conflict.new(conflict.requirement_trees.first.first, conflict.existing, conflict.requirement) ensure - @output.close if @output and !debug? + @output.close if defined?(@output) and !debug? end ## @@ -233,7 +233,7 @@ class Gem::Resolver exc.errors = @set.errors raise exc end - possibles.sort_by { |s| [s.source, s.version, s.platform.to_s == Gem::Platform.local.to_s ? 1 : 0] }. + possibles.sort_by { |s| [s.source, s.version, Gem::Platform.local =~ s.platform ? 1 : 0] }. map { |s| ActivationRequest.new s, dependency, [] } end -- cgit v1.2.3