diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2025-02-13 19:06:45 +0100 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2025-02-18 12:12:52 +0900 |
| commit | c5cdabc14a28087eda121ee9735ce457bdcd8ab3 (patch) | |
| tree | 34c8fba4d5bfe51b5e0c89ef1f4cb40748fcac9c /lib | |
| parent | c77354157f7a0af8de5f16dc1b4f352f4bc1402f (diff) | |
[rubygems/rubygems] Don't try to skip requirements to prevent downgrades
These don't really hurt, so I'm not sure why I introduced it.
https://github.com/rubygems/rubygems/commit/85b6b405ac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 3bb849d98f..61add4be10 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -626,7 +626,7 @@ module Bundler last_resolve = converge_locked_specs remove_invalid_platforms! packages = Resolver::Base.new(source_requirements, expanded_dependencies, last_resolve, @platforms, locked_specs: @originally_locked_specs, unlock: @unlocking_all || @gems_to_unlock, prerelease: gem_version_promoter.pre?, prefer_local: @prefer_local, new_platforms: @new_platforms) - packages = additional_base_requirements_to_prevent_downgrades(packages, last_resolve) + packages = additional_base_requirements_to_prevent_downgrades(packages) packages = additional_base_requirements_to_force_updates(packages) packages end @@ -1093,9 +1093,9 @@ module Bundler current == proposed end - def additional_base_requirements_to_prevent_downgrades(resolution_packages, last_resolve) + def additional_base_requirements_to_prevent_downgrades(resolution_packages) return resolution_packages unless @locked_gems && !sources.expired_sources?(@locked_gems.sources) - converge_specs(@originally_locked_specs - last_resolve).each do |locked_spec| + converge_specs(@originally_locked_specs).each do |locked_spec| next if locked_spec.source.is_a?(Source::Path) resolution_packages.base_requirements[locked_spec.name] = Gem::Requirement.new(">= #{locked_spec.version}") end |