diff options
| author | Grey Baker <greysteil@gmail.com> | 2017-09-10 17:26:19 +0100 |
|---|---|---|
| committer | Grey Baker <greysteil@gmail.com> | 2017-09-10 17:26:53 +0100 |
| commit | 3cc7b11af7accc74cfa631f7a1e51c2d75e801c4 (patch) | |
| tree | 8eb985c160fa07354fc8749088c4aee62c2416e6 /lib/bundler/resolver.rb | |
| parent | 3cf25ba0c8143e4c6e44822a110560b484a58799 (diff) | |
| download | bundler-3cc7b11af7accc74cfa631f7a1e51c2d75e801c4.tar.gz | |
Check all dependency requirements when determining if user wants pre-release
Diffstat (limited to 'lib/bundler/resolver.rb')
| -rw-r--r-- | lib/bundler/resolver.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index e323d4b168..a57f3078df 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -42,7 +42,9 @@ module Bundler end def start(requirements) - @initial_requirements = requirements + @prerelease_specified = {} + requirements.each {|dep| @prerelease_specified[dep.name] ||= dep.prerelease? } + verify_gemfile_dependencies_are_found!(requirements) dg = @resolver.resolve(requirements, @base_dg) dg.map(&:payload). @@ -102,8 +104,7 @@ module Bundler index = index_for(dependency) results = index.search(dependency, @base[dependency.name]) - inital_requirement = @initial_requirements.find {|req| req.name == dependency.name } - if !inital_requirement || !inital_requirement.requirement.prerelease? + unless @prerelease_specified[dependency.name] # Move prereleases to the beginning of the list, so they're considered # last during resolution. pre, results = results.partition {|spec| spec.version.prerelease? } |
