https://git.ruby-lang.org/ruby.git/commit/?id=7d974cc56f

From 7d974cc56fa0555beed0bf4f6fe34322cd24cd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 17 Nov 2021 14:09:50 +0100
Subject: [rubygems/rubygems] Don't overwrite locked dependency sources too
 early

Otherwise we hide some useful message about dependency source changes.

https://github.com/rubygems/rubygems/commit/c926673c5b
---
 lib/bundler/definition.rb           | 2 +-
 spec/bundler/install/deploy_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 9fa62fedca5..0c29cdc62f8 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -644,7 +644,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/definition.rb#L644
     end
 
     def converge_dependencies
-      (@dependencies + locked_dependencies).each do |dep|
+      @dependencies.each do |dep|
         if dep.source
           dep.source = sources.get(dep.source)
         end
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb
index 3604157155d..e2ca96993fb 100644
--- a/spec/bundler/install/deploy_spec.rb
+++ b/spec/bundler/install/deploy_spec.rb
@@ -379,7 +379,7 @@ RSpec.describe "install in deployment or frozen mode" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/install/deploy_spec.rb#L379
       expect(err).to include("deployment mode")
       expect(err).to include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")}")
       expect(err).not_to include("You have added to the Gemfile")
-      expect(err).not_to include("You have changed in the Gemfile")
+      expect(err).to include("You have changed in the Gemfile:\n* rack from `#{lib_path("rack-1.0")}` to `no specified source`")
     end
 
     it "explodes if you unpin a source, leaving it pinned somewhere else" do
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/