Skip to content

Commit

Permalink
[rubygems/rubygems] Fix incorrect order in changed sources message
Browse files Browse the repository at this point in the history
  • Loading branch information
deivid-rodriguez authored and matzbot committed Dec 3, 2021
1 parent ca65f7b commit aa87780
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/bundler/definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def ensure_equivalent_gemfile_and_lockfile(explicit_flag = false)
next if lock_source.nil? || lock_source.can_lock?(dep)
gemfile_source_name = dep.source || "no specified source"
lockfile_source_name = lock_source
changed << "* #{name} from `#{gemfile_source_name}` to `#{lockfile_source_name}`"
changed << "* #{name} from `#{lockfile_source_name}` to `#{gemfile_source_name}`"
end

reason = change_reason
Expand Down
2 changes: 1 addition & 1 deletion spec/bundler/install/deploy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
bundle "config set --local deployment true"
bundle :install, :raise_on_error => false
expect(err).to include("deployment mode")
expect(err).to include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")}`")
expect(err).to include("You have changed in the Gemfile:\n* rack from `#{lib_path("rack")}` to `no specified source`")
expect(err).not_to include("You have added to the Gemfile")
expect(err).not_to include("You have deleted from the Gemfile")
end
Expand Down

0 comments on commit aa87780

Please sign in to comment.