diff options
author | Andre Arko <andre@arko.net> | 2013-02-24 21:48:05 -0800 |
---|---|---|
committer | Andre Arko <andre@arko.net> | 2013-02-24 21:48:05 -0800 |
commit | 1d0f5ea78eccd24609956699e455bdee13f60552 (patch) | |
tree | f2cf9180f2b95a315491060a9b65ea368dec8eb6 /lib | |
parent | afd6bb10a6aa7a4f8b9c33e7664f7351d57a94ae (diff) | |
parent | 1acc71a39544a0e89a3d781376573cc7f578e410 (diff) | |
download | bundler-1d0f5ea78eccd24609956699e455bdee13f60552.tar.gz |
Merge pull request #2329 from chastell/bugs/remove_warnings
Remove a warning
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/resolver.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index b305a3416c..7e4b1605de 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -302,12 +302,12 @@ module Bundler # on this conflict. Note that if the tree has multiple conflicts, we don't # care which one we throw, as long as we get out safe if !current.required_by.empty? && !conflicts.empty? - @errors.reverse_each do |name, pair| - if conflicts.include?(name) + @errors.reverse_each do |req_name, pair| + if conflicts.include?(req_name) # Choose the closest pivot in the stack that will affect the conflict - errorpivot = (@stack & [name, current.required_by.last.name]).last + errorpivot = (@stack & [req_name, current.required_by.last.name]).last debug { " -> Jumping to: #{errorpivot}" } - throw errorpivot, name + throw errorpivot, req_name end end end |