summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-09-21 12:38:41 -0700
committerAndre Arko <andre@arko.net>2011-09-21 13:10:44 -0700
commitd263ce6e12a89ce8737b097b22457defd71e3e1a (patch)
treea06019dfd204c73ca333a2b86176a59d62820940
parent6be1a9ee9483202c703d06bf1bba696ba6fcc3bb (diff)
downloadbundler-d263ce6e12a89ce8737b097b22457defd71e3e1a.tar.gz
include platform in dep during resolver debugging
-rw-r--r--lib/bundler/resolver.rb6
-rw-r--r--lib/bundler/rubygems_ext.rb2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 39383441b8..581dabeaa1 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -179,15 +179,15 @@ module Bundler
activated[a.name] ? 0 : gems_size(a) ]
end
- debug { "Activated:\n" + activated.values.map { |a| " #{a.name} (#{a.version})" }.join("\n") }
- debug { "Requirements:\n" + reqs.map { |r| " #{r.name} (#{r.requirement})"}.join("\n") }
+ debug { "Activated:\n" + activated.values.map {|a| " #{a}" }.join("\n") }
+ debug { "Requirements:\n" + reqs.map {|r| " #{r}"}.join("\n") }
activated = activated.dup
# Pull off the first requirement so that we can resolve it
current = reqs.shift
- debug { "Attempting:\n #{current.name} (#{current.requirement})"}
+ debug { "Attempting:\n #{current}"}
# Check if the gem has already been activated, if it has, we will make sure
# that the currently activated gem satisfies the requirement.
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index a52ce02dc1..2eb3ef83ef 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -186,7 +186,7 @@ module Bundler
end
def to_s
- @dep.to_s
+ "#{name} (#{requirement}) #{__platform}"
end
private