diff options
author | Samuel E. Giddins <segiddins@segiddins.me> | 2014-12-03 21:44:21 -0800 |
---|---|---|
committer | Samuel E. Giddins <segiddins@segiddins.me> | 2014-12-03 21:44:21 -0800 |
commit | 11fe7a04176ffd1499d577262bdf7fdedfe4b052 (patch) | |
tree | 9d50f0ce4d9337b12dd9fdf4415a055207b9ead0 /lib/bundler/resolver.rb | |
parent | 5c45049c7ad5c240a2f8dd1f866b7b45561bc2ad (diff) | |
download | bundler-11fe7a04176ffd1499d577262bdf7fdedfe4b052.tar.gz |
[Resolver] Fix VersionConflict message
Diffstat (limited to 'lib/bundler/resolver.rb')
-rw-r--r-- | lib/bundler/resolver.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 401e7b1a31..df2c515cc5 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -49,7 +49,7 @@ module Bundler if conflict.requirement.name == "bundler" && other_bundler_required o << "\n" o << "This Gemfile requires a different version of Bundler.\n" - o << "Perhaps you need to update Bundler by running `gem install bundler`?" + o << "Perhaps you need to update Bundler by running `gem install bundler`?\n" end if conflict.locked_requirement o << "\n" @@ -58,7 +58,7 @@ module Bundler elsif !conflict.existing if conflict.requirement_trees.first.size > 1 o << "Could not find gem '#{clean_req(conflict.requirement)}', which is required by " - o << "gem '#{clean_req(conflict.requirement_trees.first.last)}', in any of the sources." + o << "gem '#{clean_req(conflict.requirement_trees.first[-2])}', in any of the sources." else o << "Could not find gem '#{clean_req(conflict.requirement)} in any of the sources\n" end |