Permalink
Browse files

Resolver conflicts can happen in the Gemfile, so error appropriately

Fixes #227
  • Loading branch information...
1 parent e901aa4 commit c2b002645d297658364f87aced7a6e81b62f7962 @indirect indirect committed Mar 30, 2010
Showing with 6 additions and 1 deletion.
  1. +6 −1 lib/bundler/resolver.rb
View
@@ -42,7 +42,12 @@ def self.resolve(requirements, index, source_requirements = {})
if origin
o << " Conflict on: #{conflict.inspect}:\n"
o << " * #{conflict} (#{origin.version}) activated by #{origin.required_by.first}\n"
- o << " * #{requirement} required by #{requirement.required_by.first}\n"
+ o << " * #{requirement} required"
+ if requirement.required_by.first
+ o << " by #{requirement.required_by.first}\n"
+ else
+ o << " in Gemfile\n"
+ end
else
o << " #{requirement} not found in any of the sources\n"
o << " required by #{requirement.required_by.first}\n"

0 comments on commit c2b0026

Please sign in to comment.