diff options
| author | Bundlerbot <bot@bundler.io> | 2019-12-13 10:07:09 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-12-13 10:07:09 +0000 |
| commit | 6394536271a0326efd4ed3544b78e528da7e90b1 (patch) | |
| tree | 559549a627db55e0f807e38c33029a4d1860a663 /spec/support | |
| parent | 14d23844689aac341957b3b6bc6b336beb14588b (diff) | |
| parent | 6a65f741ad2980159f8744d3a6d7063bb1235b17 (diff) | |
| download | bundler-6394536271a0326efd4ed3544b78e528da7e90b1.tar.gz | |
Merge #7460
7460: Vendor `uri` library r=hsbt a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was that after the gemification of the `uri` library (which will happen in ruby 2.7), `bundler` will activate the default version of the new library inside its own `bundler/setup` code. That means users won't be able to specify the version of the library they want/need to use in their own Gemfiles.
### What was your diagnosis of the problem?
My diagnosis was that we should avoid using `uri` inside `bundler/setup` code.
### What is your fix for the problem, implemented in this PR?
My fix is to vendor the `uri` library, like we did with `fileutils`.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/path.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/support/path.rb b/spec/support/path.rb index 1c142e2643..eea3161b15 100644 --- a/spec/support/path.rb +++ b/spec/support/path.rb @@ -100,8 +100,6 @@ module Spec protocol = "file://" root = Gem.win_platform? ? "/" : "" - return protocol + "localhost" + root + path.to_s if RUBY_VERSION < "2.5" - protocol + root + path.to_s end |