diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-04-05 14:15:42 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-04-05 14:15:42 -0500 |
| commit | cd73ba0ebd625d3469ef4d0fc2b250c1ccda0bb2 (patch) | |
| tree | 44dc49d4ac6b5dfcfa79f651b8fdd41dc2dc5db8 | |
| parent | fab16c52e76b002fb921b4b3728634ed946289c1 (diff) | |
| download | bundler-cd73ba0ebd625d3469ef4d0fc2b250c1ccda0bb2.tar.gz | |
[Definition] Clean up converge_locked_specs logic
| -rw-r--r-- | lib/bundler/definition.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index ff9392b9df..b1124218cf 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -746,11 +746,13 @@ module Bundler # Don't add a spec to the list if its source is expired. For example, # if you change a Git gem to Rubygems. - next if s.source.nil? || @unlock[:sources].include?(s.source.name) + next if s.source.nil? + next if @unlock[:sources].include?(s.source.name) # XXX This is a backwards-compatibility fix to preserve the ability to # unlock a single gem by passing its name via `--source`. See issue #3759 - next if s.source.nil? || @unlock[:sources].include?(s.name) + # TODO: delete in Bundler 2 + next if @unlock[:sources].include?(s.name) # If the spec is from a path source and it doesn't exist anymore # then we unlock it. |