From 8da8d4b043c37b53a69803c71ff36b478d4776d0 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 30 May 2018 13:01:35 +0000 Subject: Merge RubyGems 3.0.0.beta1. * It drop to support < Ruby 2.2 * Cleanup deprecated methods and classes. * Mark obsoleted methods to deprecate. * and other enhancements. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/resolver/api_specification.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/rubygems/resolver') diff --git a/lib/rubygems/resolver/api_specification.rb b/lib/rubygems/resolver/api_specification.rb index 1e22dd0b6f..c4e8a7cb54 100644 --- a/lib/rubygems/resolver/api_specification.rb +++ b/lib/rubygems/resolver/api_specification.rb @@ -21,6 +21,7 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification @name = api_data[:name] @version = Gem::Version.new api_data[:number] @platform = Gem::Platform.new api_data[:platform] + @original_platform = api_data[:platform] @dependencies = api_data[:dependencies].map do |name, ver| Gem::Dependency.new name, ver.split(/\s*,\s*/) end @@ -73,7 +74,11 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification @spec ||= begin tuple = Gem::NameTuple.new @name, @version, @platform + source.fetch_spec tuple + rescue Gem::RemoteFetcher::FetchError + raise if @original_platform == @platform + tuple = Gem::NameTuple.new @name, @version, @original_platform source.fetch_spec tuple end end -- cgit v1.2.3