summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-04-30 09:41:26 -0700
committerAndre Arko <andre@arko.net>2015-05-02 19:52:02 -0700
commit75a8792861b8ab78659ce1752e13ec24a59cb88b (patch)
tree2bca530c55710d7b04863569e010b9d35457b827
parente0c8f44ed32ab62ce4dbaa66455e2dbd5c0a2070 (diff)
downloadbundler-75a8792861b8ab78659ce1752e13ec24a59cb88b.tar.gz
Fix shadowed variable warning again post-merge
-rw-r--r--lib/bundler/definition.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 86dbfba2a5..70e2efda55 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -521,7 +521,7 @@ module Bundler
converged = []
@locked_specs.each do |s|
# Replace the locked dependency's source with the equivalent source from the Gemfile
- dep = @dependencies.find { |dep| s.satisfies?(dep) }
+ dep = @dependencies.find { |d| s.satisfies?(d) }
s.source = (dep && dep.source) || sources.get(s.source)
# Don't add a spec to the list if its source is expired. For example,