diff options
author | Andre Arko <andre@arko.net> | 2015-08-02 17:05:26 -0700 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2015-08-02 22:23:04 -0700 |
commit | 28483b733f8ee79260a52e42c89bbdf4d77d68a7 (patch) | |
tree | 5c2f56dcfe0b307c2434430b5091e305d3184711 | |
parent | 69475cb66c86c271494299e595b0ad3f04bbda31 (diff) | |
download | bundler-fix-fix-3862.tar.gz |
Use locked_requirement platform to print it outfix-fix-3862
-rw-r--r-- | lib/bundler/resolver.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 8ac495fac4..fa8efe37b6 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -3,12 +3,20 @@ module Bundler require "bundler/vendored_molinillo" class Molinillo::VersionConflict + def printable_dep(dep) + if dep.is_a?(Bundler::Dependency) + DepProxy.new(dep, dep.platforms.join(", ")).to_s.strip + else + dep.to_s + end + end + def message conflicts.sort.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 << %( #{DepProxy.new(conflict.locked_requirement, Gem::Platform::RUBY)}\n) + o << %( #{printable_dep(conflict.locked_requirement)}\n) o << %(\n) end o << %( In Gemfile:\n) |