diff options
| author | Smit Shah <who828@gmail.com> | 2014-11-24 21:30:11 +0530 |
|---|---|---|
| committer | Smit Shah <who828@gmail.com> | 2014-11-24 21:30:11 +0530 |
| commit | d672064dbd3ea69144d43f66cbf0b6a926fbe0a9 (patch) | |
| tree | 2691734d8e1086fad6234e8095f600d92c8db0d4 | |
| parent | 74c974e0985203ffc59e7c23971c5fcddec39454 (diff) | |
| download | bundler-d672064dbd3ea69144d43f66cbf0b6a926fbe0a9.tar.gz | |
Don't waste iterations in resolving Bundler, just use the current version
| -rw-r--r-- | lib/bundler/resolver.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 5b9fdfffca..daccb7628a 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -293,7 +293,7 @@ module Bundler activated['bundler'] = existing end - if current.requirement.satisfied_by?(existing.version) + if current.requirement.satisfied_by?(existing.version) || current.name == 'bundler' debug { " * [SUCCESS] Already activated" } @errors.delete(existing.name) dependencies = existing.activate_platform(current.__platform) |