From 1acc71a39544a0e89a3d781376573cc7f578e410 Mon Sep 17 00:00:00 2001 From: Piotr Szotkowski Date: Sun, 24 Feb 2013 19:14:33 +0100 Subject: minor rename to remove variable shadowing warning --- lib/bundler/resolver.rb | 8 ++++---- 1 file 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 -- cgit v1.2.1