Skip to content

Commit 8b952e6

Browse files
deivid-rodriguezhsbt
authored andcommitted
[rubygems/rubygems] Improve log message when resolving due to local platform not in lockfile
Current it says "you added a new platform to your gemfile", but that's not actually the case here. ruby/rubygems@1e39527a38
1 parent 71f0c37 commit 8b952e6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/bundler/definition.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,8 @@ def resolution_packages
625625
@resolution_packages ||= begin
626626
last_resolve = converge_locked_specs
627627
remove_invalid_platforms!
628-
packages = Resolver::Base.new(source_requirements, expanded_dependencies, last_resolve, @platforms, locked_specs: @originally_locked_specs, unlock: @unlocking_all || @gems_to_unlock, prerelease: gem_version_promoter.pre?, prefer_local: @prefer_local, new_platforms: @new_platforms)
628+
new_resolution_platforms = @current_platform_missing ? @new_platforms.append(local_platform) : @new_platforms
629+
packages = Resolver::Base.new(source_requirements, expanded_dependencies, last_resolve, @platforms, locked_specs: @originally_locked_specs, unlock: @unlocking_all || @gems_to_unlock, prerelease: gem_version_promoter.pre?, prefer_local: @prefer_local, new_platforms: new_resolution_platforms)
629630
packages = additional_base_requirements_to_prevent_downgrades(packages)
630631
packages = additional_base_requirements_to_force_updates(packages)
631632
packages
@@ -768,7 +769,6 @@ def add_current_platform
768769
@most_specific_non_local_locked_platform = find_most_specific_locked_platform
769770
return if @most_specific_non_local_locked_platform
770771

771-
@new_platforms << local_platform
772772
@platforms << local_platform
773773
true
774774
end

spec/bundler/commands/install_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,7 @@ def run
13691369
bundle "install --verbose"
13701370

13711371
expect(out).to include("re-resolving dependencies because your lockfile does not include the current platform")
1372+
expect(out).not_to include("you added a new platform to your gemfile")
13721373

13731374
expect(lockfile).to eq <<~L
13741375
GEM

0 commit comments

Comments
 (0)