summaryrefslogtreecommitdiff
path: root/lib/bundler/resolver.rb
diff options
context:
space:
mode:
authorGrey Baker <greysteil@gmail.com>2017-11-23 20:53:42 +0000
committerGrey Baker <greysteil@gmail.com>2017-11-27 15:44:24 +0000
commit5e434f754132764465f68e4a2b7dbb8116644d3c (patch)
tree90911c3d675d0092a59fbcbdd3e7af417177565c /lib/bundler/resolver.rb
parent914a4a8b8d0cf1a79dbc7b334fbb5c2db1ecdc16 (diff)
downloadbundler-5e434f754132764465f68e4a2b7dbb8116644d3c.tar.gz
Resolver: treat dependencies with prerelease versions as slightly constrained
Diffstat (limited to 'lib/bundler/resolver.rb')
-rw-r--r--lib/bundler/resolver.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 8a3afa3418..d7911c1de2 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -249,7 +249,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