kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Completely avoid replacing sources when in multisource compatibility mode

Browse source 
Since this mode is only enabled in frozen mode, it's fine to use the
lockfile and means we don't have to "prepare" the replacement for
materialization.

dda01b288e
This commit is contained in:
David Rodríguez 2021-07-24 18:16:32 +02:00 • committed by Hiroshi SHIBATA
parent c2f376bcc0
commit 1b9b41472f
Notes: git 2021-08-31 19:07:25 +09:00
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/bundler/definition.rb
View file

@ -721,7 +721,7 @@ module Bundler
@locked_specs.each do |s| @locked_specs.each do |s|
# Replace the locked dependency's source with the equivalent source from the Gemfile # Replace the locked dependency's source with the equivalent source from the Gemfile
dep = @dependencies.find {|d| s.satisfies?(d) } dep = @dependencies.find {|d| s.satisfies?(d) }
s.source = (dep && dep.source) || sources.get(s.source) s.source = (dep && dep.source) || sources.get(s.source) unless multisource_allowed?
# Don't add a spec to the list if its source is expired. For example, # Don't add a spec to the list if its source is expired. For example,
# if you change a Git gem to RubyGems. # if you change a Git gem to RubyGems.

2
lib/bundler/source_list.rb
View file

@ -215,7 +215,7 @@ module Bundler
end end
def equal_source?(source, other_source) def equal_source?(source, other_source)
return source.include?(other_source) if source.is_a?(Source::Rubygems) && other_source.is_a?(Source::Rubygems) && !merged_gem_lockfile_sections? return source.include?(other_source) if source.is_a?(Source::Rubygems) && other_source.is_a?(Source::Rubygems)
source == other_source source == other_source
end end