diff options
| author | Hiroshi SHIBATA <[email protected]> | 2020-12-23 08:45:19 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2020-12-23 10:17:41 +0900 |
| commit | 339227363ce0cf967fa17efa4489d823932ddabd (patch) | |
| tree | 576482ce00d03439f2dbf4714a6f309293884c2f /lib/rubygems/source.rb | |
| parent | 733ed1e18498f97250b788f169c37b170e0cf2b6 (diff) | |
Merge RubyGems 3.2.3 and Bundler 2.2.3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3982
Diffstat (limited to 'lib/rubygems/source.rb')
| -rw-r--r-- | lib/rubygems/source.rb | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb index a2848112e7..4ae84cf532 100644 --- a/lib/rubygems/source.rb +++ b/lib/rubygems/source.rb @@ -79,7 +79,15 @@ class Gem::Source def dependency_resolver_set # :nodoc: return Gem::Resolver::IndexSet.new self if 'file' == uri.scheme - bundler_api_uri = enforce_trailing_slash(uri) + './api/v1/dependencies' + fetch_uri = if uri.host == "rubygems.org" + index_uri = uri.dup + index_uri.host = "index.rubygems.org" + index_uri + else + uri + end + + bundler_api_uri = enforce_trailing_slash(fetch_uri) begin fetcher = Gem::RemoteFetcher.fetcher @@ -87,11 +95,7 @@ class Gem::Source rescue Gem::RemoteFetcher::FetchError Gem::Resolver::IndexSet.new self else - if response.respond_to? :uri - Gem::Resolver::APISet.new response.uri - else - Gem::Resolver::APISet.new bundler_api_uri - end + Gem::Resolver::APISet.new response.uri + "./info/" end end |