summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2016-10-15 08:31:50 +0900
committerHomu <homu@barosl.com>2016-10-15 08:31:50 +0900
commit9b12e554a537489bce2bc57f3b24cd7695c0aa77 (patch)
tree6295eddf70c9f4f7f53e6a3fe6f662ab7cf57320 /lib
parent37ec6051f6442a23b2c524cfdee02a13873a2a61 (diff)
parentf0aaed7c123c23f1fec8e963c2f2ffa6d734b6cf (diff)
downloadbundler-9b12e554a537489bce2bc57f3b24cd7695c0aa77.tar.gz
Auto merge of #5090 - bundler:aa-missing-specs, r=indirect
[Index] Allow pre-release versions in search when the base is pre-release Closes #5089
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/index.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
index 4529c57279..5bdb102d37 100644
--- a/lib/bundler/index.rb
+++ b/lib/bundler/index.rb
@@ -179,7 +179,8 @@ module Bundler
end
wants_prerelease = dependency.requirement.prerelease?
- only_prerelease = specs.all? {|spec| spec.version.prerelease? }
+ wants_prerelease ||= base && base.any? {|base_spec| base_spec.version.prerelease? }
+ only_prerelease = specs.all? {|spec| spec.version.prerelease? }
unless wants_prerelease || only_prerelease
found.reject! {|spec| spec.version.prerelease? }