summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-02-20 12:27:37 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-02-20 12:27:37 +0100
commit9c99a81e62f110c4c401928bff8fc7312fbd2d54 (patch)
treeab863e6977e300962224dac628edfb10d810dc00
parent127df7c634d1d33ffd93dcbb376d2a0d5cad5e4f (diff)
downloadbundler-use_newer_list_interface.tar.gz
Slightly better wording of error messagesuse_newer_list_interface
-rw-r--r--lib/bundler/source/git.rb4
-rw-r--r--spec/install/gemfile/git_spec.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index 225e214dd5..a8afb341d8 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -124,13 +124,13 @@ module Bundler
unless options["branch"] || Bundler.settings[:disable_local_branch_check]
raise GitError, "Cannot use local override for #{name} at #{path} because " \
- ":branch is not specified in Gemfile. Specify a branch or use " \
+ ":branch is not specified in Gemfile. Specify a branch or run " \
"`bundle config unset local.#{override_for(original_path)}` to remove the local override"
end
unless path.exist?
raise GitError, "Cannot use local override for #{name} because #{path} " \
- "does not exist. Check `bundle config unset local.#{override_for(original_path)}` to remove the local override"
+ "does not exist. Run `bundle config unset local.#{override_for(original_path)}` to remove the local override"
end
set_local!(path)
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index ac2849c8d8..cf98f1c2c3 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -510,7 +510,7 @@ RSpec.describe "bundle install with git sources" do
expect(err).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
solution = "config unset local.rack"
- expect(err).to match(/Check `bundle #{solution}` to remove the local override/)
+ expect(err).to match(/Run `bundle #{solution}` to remove the local override/)
bundle solution
bundle :install
@@ -532,7 +532,7 @@ RSpec.describe "bundle install with git sources" do
expect(err).to match(/Cannot use local override for rack-0.8 at #{Regexp.escape(lib_path('local-rack').to_s)} because :branch is not specified in Gemfile/)
solution = "config unset local.rack"
- expect(err).to match(/Specify a branch or use `bundle #{solution}` to remove the local override/)
+ expect(err).to match(/Specify a branch or run `bundle #{solution}` to remove the local override/)
bundle solution
bundle :install