diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-18 12:13:33 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-12-18 13:33:18 +0900 |
commit | 0e40cc9b194a5e46024d32b85a61e651372a65cb (patch) | |
tree | d91f781ca34d78897d8cea9fb3403e47f891df5a /lib/bundler/resolver.rb | |
parent | 34f06062174882a98ebef998c50ad8d4f7fc0f2e (diff) | |
download | ruby-0e40cc9b194a5e46024d32b85a61e651372a65cb.tar.gz |
Merge RubyGems 3.2.2 and Bundler 2.2.2
Diffstat (limited to 'lib/bundler/resolver.rb')
-rw-r--r-- | lib/bundler/resolver.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 4bbcbd1162..636dc8af46 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -155,6 +155,8 @@ module Bundler search.each do |sg| next unless sg.for?(platform) sg_all_platforms = sg.copy_for(self.class.sort_platforms(@platforms).reverse) + next unless sg_all_platforms + selected_sgs << sg_all_platforms next if sg_all_platforms.activated_platforms == [Gem::Platform::RUBY] |