1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] Materializing for resolution already filters platforms

Browse Source 
https://github.com/rubygems/rubygems/commit/9f4ba9ebb0
This commit is contained in:
David Rodríguez 2022-07-29 22:09:51 +02:00 committed by git
parent 8c98f7be57
commit 9189c2d5ef
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/bundler/lazy_specification.rb
View File

@ -78,24 +78,29 @@ module Bundler
def materialize_for_installation def materialize_for_installation
source.local! source.local!
__materialize__(ruby_platform_materializes_to_ruby_platform? ? platform : Bundler.local_platform) candidates = if source.is_a?(Source::Path) || !ruby_platform_materializes_to_ruby_platform?
target_platform = ruby_platform_materializes_to_ruby_platform? ? platform : Bundler.local_platform
source.specs.search(Dependency.new(name, version)).select do |spec|
MatchPlatform.platforms_match?(spec.platform, target_platform)
end
else
source.specs.search(self)
end
__materialize__(candidates)
end end
def materialize_for_resolution def materialize_for_resolution
return self unless Gem::Platform.match_spec?(self) return self unless Gem::Platform.match_spec?(self)
__materialize__(platform) candidates = source.specs.search(self)
__materialize__(candidates)
end end
def __materialize__(platform) def __materialize__(candidates)
@specification = begin @specification = begin
candidates = if source.is_a?(Source::Path) || !ruby_platform_materializes_to_ruby_platform?
source.specs.search(Dependency.new(name, version)).select do |spec|
MatchPlatform.platforms_match?(spec.platform, platform)
end
else
source.specs.search(self)
end
search = candidates.reverse.find do |spec| search = candidates.reverse.find do |spec|
spec.is_a?(StubSpecification) || spec.is_a?(StubSpecification) ||
(spec.required_ruby_version.satisfied_by?(Gem.ruby_version) && (spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&