diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-09-11 11:27:19 -0700 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-09-13 15:38:18 -0500 |
| commit | 570289498284575c33ba45374c8eedbffde2d1fb (patch) | |
| tree | 62001c0eb6bd93ccd89b2a703f95ccc53e23c5fc /lib | |
| parent | 7326958a66c21a19586cbaf9027a08cf2ff20971 (diff) | |
| download | bundler-570289498284575c33ba45374c8eedbffde2d1fb.tar.gz | |
[SpecSet] Use full_name in #merge
This means specs with a Gem::Platform can be compared to those with a platform string
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/spec_set.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index 5239a96213..7cd3021997 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -110,9 +110,10 @@ module Bundler def merge(set) arr = sorted.dup - set.each do |s| - next if arr.any? {|s2| s2.name == s.name && s2.version == s.version && s2.platform == s.platform } - arr << s + set.each do |set_spec| + full_name = set_spec.full_name + next if arr.any? {|spec| spec.full_name == full_name } + arr << set_spec end SpecSet.new(arr) end |
