diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-01-04 10:09:05 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-01-04 13:14:43 +0900 |
commit | 5537adf719a37a30b17d39111cc03700f353aa2d (patch) | |
tree | 7523de9950b8a0118143f4ee0029aee17d043e04 /lib/rubygems/resolver | |
parent | 35c3a24c8cbcccff1108079360e2063fc354b4bd (diff) | |
download | ruby-5537adf719a37a30b17d39111cc03700f353aa2d.tar.gz |
Track RubyGems master(3.3.0.dev) branch at 55634a8af18a52df86c4275d70fa1179118bcc20
Diffstat (limited to 'lib/rubygems/resolver')
-rw-r--r-- | lib/rubygems/resolver/best_set.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/resolver/index_specification.rb | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/rubygems/resolver/best_set.rb b/lib/rubygems/resolver/best_set.rb index b6a46a9403..300ea8015c 100644 --- a/lib/rubygems/resolver/best_set.rb +++ b/lib/rubygems/resolver/best_set.rb @@ -58,7 +58,7 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet # The calling method must retry the exception to repeat the lookup. def replace_failed_api_set(error) # :nodoc: - uri = error.uri + uri = error.original_uri uri = URI uri unless URI === uri uri = uri + "." diff --git a/lib/rubygems/resolver/index_specification.rb b/lib/rubygems/resolver/index_specification.rb index 45ff130a14..2aa6b419ba 100644 --- a/lib/rubygems/resolver/index_specification.rb +++ b/lib/rubygems/resolver/index_specification.rb @@ -43,9 +43,12 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification ## # The required_rubygems_version constraint for this specification # + # A fallback is included because the original version of the specification + # API didn't include that field, so some marshalled specs in the index have it + # set to +nil+. def required_rubygems_version - spec.required_rubygems_version + spec.required_rubygems_version || Gem::Requirement.default end def ==(other) |