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/resolver | |
| 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/resolver')
| -rw-r--r-- | lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb index 16430a79f5..95f8416b96 100644 --- a/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb +++ b/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require 'tsort' +require_relative '../../../../tsort' require_relative 'dependency_graph/log' require_relative 'dependency_graph/vertex' @@ -17,7 +17,7 @@ module Gem::Resolver::Molinillo vertices.values.each { |v| yield v } end - include TSort + include Gem::TSort # @!visibility private alias tsort_each_node each |