From 8de5afad2753facb13010e0fff9ece565a30ca3e Mon Sep 17 00:00:00 2001 From: "Samuel E. Giddins" Date: Wed, 22 Jul 2015 20:53:43 -0700 Subject: [Resolver] No need to grab the name off of the conflicting requirement --- lib/bundler/resolver.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 5b21da2b53..3d21bf67bb 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -4,8 +4,8 @@ module Bundler class Molinillo::VersionConflict def message - conflicts.values.flatten.reduce("") do |o, conflict| - o << %(Bundler could not find compatible versions for gem "#{conflict.requirement.name}":\n) + conflicts.reduce("") do |o, (name, conflict)| + o << %(Bundler could not find compatible versions for gem "#{name}":\n) if conflict.locked_requirement o << %( In snapshot (#{Bundler.default_lockfile.basename}):\n) o << %( #{conflict.locked_requirement}\n) @@ -24,12 +24,12 @@ module Bundler t end.join("\n") - if conflict.requirement.name == "bundler" + if name == "bundler" o << %(\n Current Bundler version:\n bundler (#{Bundler::VERSION})) other_bundler_required = !conflict.requirement.requirement.satisfied_by?(Gem::Version.new Bundler::VERSION) end - if conflict.requirement.name == "bundler" && other_bundler_required + if 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`?\n" -- cgit v1.2.1