Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Commit

Permalink
minor rename to remove variable shadowing warning
Browse files Browse the repository at this point in the history
  • Loading branch information
chastell committed Feb 24, 2013
1 parent 9dd73af commit 1acc71a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/bundler/resolver.rb
Expand Up @@ -302,12 +302,12 @@ def resolve(reqs, activated)
# 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
Expand Down

0 comments on commit 1acc71a

Please sign in to comment.