diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 06:15:44 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 06:15:44 +0000 |
| commit | a1a20cfaa2cf73ae8daaf2123d7c5b513427162e (patch) | |
| tree | 7f112577119ebda6c3dfd71cbc24f1bc559280ae /lib/bundler/resolver.rb | |
| parent | f1c33950998bf2d38d9416aa4f5dfe7f9f869f86 (diff) | |
Merge 1-16-stable branch of bundler.
It's rc version for bundler-1.16.1. I'm going to update it version
after official release from bundler team.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/bundler/resolver.rb')
| -rw-r--r-- | lib/bundler/resolver.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index ddc1d702e0..bfc6b91576 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -245,7 +245,8 @@ module Bundler if all <= 1 all - 1_000_000 else - search = search_for(dependency).size + search = search_for(dependency) + search = @prerelease_specified[dependency.name] ? search.count : search.count {|s| !s.version.prerelease? } search - all end end |