diff options
| author | Frederik Dudzik <[email protected]> | 2021-10-21 12:23:08 -0700 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2021-10-29 18:00:46 +0900 |
| commit | 17fb785d1557d35fc9e28af59bdbef50ddbd08d9 (patch) | |
| tree | 44ae4dae5996caf8a1d63dc320c964c16502b124 /lib/rubygems/request_set.rb | |
| parent | f45af5f0a427a85fd157bbb1461a7dc33d30eb1b (diff) | |
[rubygems/rubygems] Vendor tsort into rubygems
So that it loads a consistent version of the library and `rubygems` is
never affected by gem activation conflicts related to `tsort`.
Getting CI green required updating one `bundler` spec, because `tsort`
is no longer loaded by `bundle clean` until after `BUNDLE_PATH` has been
changed, so to ensure it is found, it needs to be installed under
`BUNDLE_PATH` as well (which will be different from the global system
path on Bundler 3, meaning installing `tsort` to the global system path
is not enough there). This spec workaround can be removed once we also
vendor `tsort` inside `bundler`.
https://github.com/rubygems/rubygems/commit/d326880999
Diffstat (limited to 'lib/rubygems/request_set.rb')
| -rw-r--r-- | lib/rubygems/request_set.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/request_set.rb b/lib/rubygems/request_set.rb index 9286c54221..01b01599a8 100644 --- a/lib/rubygems/request_set.rb +++ b/lib/rubygems/request_set.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true -require 'tsort' +require_relative 'tsort' ## # A RequestSet groups a request to activate a set of dependencies. @@ -15,7 +15,7 @@ require 'tsort' # #=> ["nokogiri-1.6.0", "mini_portile-0.5.1", "pg-0.17.0"] class Gem::RequestSet - include TSort + include Gem::TSort ## # Array of gems to install even if already installed |