summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2021-11-17 14:21:48 +0100
committergit <svn-admin@ruby-lang.org>2021-12-03 20:00:49 +0900
commitaa87780f8f27253e216d4883dd4cae84d545ec1b (patch)
treee5aeec0653e890e8339576792076921377b46f8d
parentca65f7bb8afe747628d3d48caf63e5fcba303e29 (diff)
[rubygems/rubygems] Fix incorrect order in changed sources message
https://github.com/rubygems/rubygems/commit/6f1b5f68de
-rw-r--r--lib/bundler/definition.rb2
-rw-r--r--spec/bundler/install/deploy_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 9afbdfa07d..9fa62fedca 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -400,7 +400,7 @@ module Bundler
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
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb
index 8f2650a932..3604157155 100644
--- a/spec/bundler/install/deploy_spec.rb
+++ b/spec/bundler/install/deploy_spec.rb
@@ -401,7 +401,7 @@ RSpec.describe "install in deployment or frozen mode" do
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