diff options
| author | Smit Shah <who828@gmail.com> | 2014-01-10 18:27:58 +0530 |
|---|---|---|
| committer | Smit Shah <who828@gmail.com> | 2014-01-10 18:27:58 +0530 |
| commit | 5338e97974b02ae0391317b8b6e45d3151488638 (patch) | |
| tree | 6a7cac64f61ba024a3dd9a279158dba809511a23 /lib/bundler/resolver.rb | |
| parent | 0c9d07e25151f6c80fab90930a8ed7dd94633f3b (diff) | |
| download | bundler-5338e97974b02ae0391317b8b6e45d3151488638.tar.gz | |
Fixed the failing spec in Ruby 1.8.7
Diffstat (limited to 'lib/bundler/resolver.rb')
| -rw-r--r-- | lib/bundler/resolver.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index fea1f485b1..d0f769736d 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -301,9 +301,7 @@ module Bundler @errors[existing.name] = [existing, current] parent = current.required_by.last - unless parent && other_possible?(parent.name, states) - parent = existing.required_by.last if existing.respond_to?(:required_by) - end + parent = current unless parent && other_possible?(parent.name, states) raise version_conflict if parent.name == 'bundler' |