lib/bundler/definition.rb in bundler-2.4.15 vs lib/bundler/definition.rb in bundler-2.4.16

@@ -392,12 +392,12 @@
 
         gemfile_source = dep.source || sources.default_source
         lock_source = lock_dep.source || sources.default_source
         next if lock_source.include?(gemfile_source)
 
-        gemfile_source_name = dep.source ? gemfile_source.identifier : "no specified source"
-        lockfile_source_name = lock_dep.source ? lock_source.identifier : "no specified source"
+        gemfile_source_name = dep.source ? gemfile_source.to_gemfile : "no specified source"
+        lockfile_source_name = lock_dep.source ? lock_source.to_gemfile : "no specified source"
         changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`"
       end
 
       reason = change_reason
       msg = String.new
@@ -698,11 +698,11 @@
       end
 
       return if @dependency_changes
 
       current_dependencies.find do |d|
-        @locked_specs[d.name].empty?
+        @locked_specs[d.name].empty? && d.name != "bundler"
       end&.name
     end
 
     def converge_paths
       sources.path_sources.any? do |source|
@@ -939,9 +939,10 @@
     def remove_ruby_from_platforms_if_necessary!(dependencies)
       return if Bundler.frozen_bundle? ||
                 Bundler.local_platform == Gem::Platform::RUBY ||
                 !platforms.include?(Gem::Platform::RUBY) ||
                 (@new_platform && platforms.last == Gem::Platform::RUBY) ||
+                @path_changes ||
                 @dependency_changes ||
                 !@originally_locked_specs.incomplete_ruby_specs?(dependencies)
 
       remove_platform(Gem::Platform::RUBY)
       add_current_platform