From fff9b45fa949f72b5cc6971b54eb3aa384d1d022 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Wed, 22 Dec 2021 07:52:59 +0900
Subject: Reverts the accidental commits for rubygems/bundler.

  We stay to the stable version for releasing Ruby 3.1.0.

  Revert commits:
    b86a7ba49252e00e19c22bbcdc821b5acc31ff92
    ef973aa7aa65143a4f05d623c016d459426770d0
---
 lib/bundler/definition.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'lib')

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 19e5569fad..9a94bd3ed3 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -87,11 +87,10 @@ module Bundler
         @platforms = @locked_platforms.dup
         @locked_bundler_version = @locked_gems.bundler_version
         @locked_ruby_version = @locked_gems.ruby_version
-        @originally_locked_specs = SpecSet.new(@locked_gems.specs)
 
         if unlock != true
           @locked_deps    = @locked_gems.dependencies
-          @locked_specs   = @originally_locked_specs
+          @locked_specs   = SpecSet.new(@locked_gems.specs)
           @locked_sources = @locked_gems.sources
         else
           @unlock         = {}
@@ -692,17 +691,14 @@ module Bundler
     def converge_specs(specs)
       deps = []
       converged = []
-
-      @dependencies.each do |dep|
-        if specs[dep].any? {|s| s.satisfies?(dep) && (!dep.source || s.source.include?(dep.source)) }
-          deps << dep
-        end
-      end
-
       specs.each do |s|
         # Replace the locked dependency's source with the equivalent source from the Gemfile
         dep = @dependencies.find {|d| s.satisfies?(d) }
 
+        if dep && (!dep.source || s.source.include?(dep.source))
+          deps << dep
+        end
+
         s.source = (dep && dep.source) || sources.get(s.source) || sources.default_source unless Bundler.frozen_bundle?
 
         next if @unlock[:sources].include?(s.source.name)
@@ -834,7 +830,7 @@ module Bundler
 
     def additional_base_requirements_for_resolve
       return [] unless @locked_gems && unlocking? && !sources.expired_sources?(@locked_gems.sources)
-      converge_specs(@originally_locked_specs).map do |locked_spec|
+      converge_specs(@locked_gems.specs).map do |locked_spec|
         name = locked_spec.name
         dep = Gem::Dependency.new(name, ">= #{locked_spec.version}")
         DepProxy.get_proxy(dep, locked_spec.platform)
-- 
cgit v1.2.3