diff options
| author | Smit Shah <who828@gmail.com> | 2014-11-26 22:28:44 +0530 |
|---|---|---|
| committer | Smit Shah <who828@gmail.com> | 2014-11-26 22:28:44 +0530 |
| commit | 46895a2418d08ea10000aea03a717337e7b7d92d (patch) | |
| tree | b7e321a46b0fe2750dc879e6b0bbe0f3eb435066 | |
| parent | bb2ddb36f3373ab04ac7c25d2cc343f7ec561821 (diff) | |
| download | bundler-46895a2418d08ea10000aea03a717337e7b7d92d.tar.gz | |
Revert "Don't waste iterations in resolving Bundler, just use the current version"
This reverts commit d672064dbd3ea69144d43f66cbf0b6a926fbe0a9.
| -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 9fc73f46cf..ab79a80e9b 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) || current.name == 'bundler' + if current.requirement.satisfied_by?(existing.version) debug { " * [SUCCESS] Already activated" } @errors.delete(existing.name) dependencies = existing.activate_platform(current.__platform) |