diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-11-12 06:00:58 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-11-12 07:40:31 +0900 |
| commit | 0a9d51ee9d2b3d0111832e5ea1c8195a16e2f99b (patch) | |
| tree | 4ecad2ecbcbb06893f20fe900e04b3d982b420e1 /lib/bundler/spec_set.rb | |
| parent | 14a1394bcd85c90c9f14f687fd4a80ba5b96b437 (diff) | |
Migrate our resolver engine to PubGrub
https://github.com/rubygems/rubygems/pull/5960
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'lib/bundler/spec_set.rb')
| -rw-r--r-- | lib/bundler/spec_set.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index 21d57fdab4..a3d9218593 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -122,8 +122,8 @@ module Bundler @specs.detect {|spec| spec.name == name && spec.match_platform(platform) } end - def delete_by_name_and_version(name, version) - @specs.reject! {|spec| spec.name == name && spec.version == version } + def delete_by_name(name) + @specs.reject! {|spec| spec.name == name } @lookup = nil @sorted = nil end @@ -165,7 +165,7 @@ module Bundler cgems = extract_circular_gems(error) raise CyclicDependencyError, "Your bundle requires gems that depend" \ " on each other, creating an infinite loop. Please remove either" \ - " gem '#{cgems[1]}' or gem '#{cgems[0]}' and try again." + " gem '#{cgems[0]}' or gem '#{cgems[1]}' and try again." end end |