diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-06-07 13:07:27 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-06-18 19:14:15 +0900 |
commit | f8f3f11ed580074960e5de1de4552bdf14d7d70d (patch) | |
tree | 1f469bce4bda8dee09258b4d624b0367d82d5952 /lib | |
parent | a447563cf899f2a33511c12735160a8bbd0efecd (diff) | |
download | ruby-f8f3f11ed580074960e5de1de4552bdf14d7d70d.tar.gz |
[rubygems/rubygems] Fix `only_update_to_newer_versions` regression
The `only_update_to_newer_versions` feature flag will enable some new
behaviour in bundler 3 (or maybe earlier if we decide to consider it a
bug fix) that prevents `bundle update` from unexpectedly downgrading
direct dependencies.
This seems reasonable, but the current implementation is adding
additional requirements for all locked dependencies, not only from the
ones in the `Gemfile`. That causes some situations where the `Gemfile`
is edited and will resolve to older versions to start failing.
This commit fixes the problem by making sure extra requirements are
added exclusively for direct dependencies in the `Gemfile`, not for all
direct dependencies in the lock file.
https://github.com/rubygems/rubygems/commit/128b4596e1
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/definition.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index df87358ac8..e668ac7953 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -984,8 +984,9 @@ module Bundler @locked_gems.specs.reduce({}) do |requirements, locked_spec| name = locked_spec.name dependency = dependencies_by_name[name] + next requirements unless dependency next requirements if @locked_gems.dependencies[name] != dependency - next requirements if dependency && dependency.source.is_a?(Source::Path) + next requirements if dependency.source.is_a?(Source::Path) dep = Gem::Dependency.new(name, ">= #{locked_spec.version}") requirements[name] = DepProxy.new(dep, locked_spec.platform) requirements |