ruby-changes:72777
From: David <ko1@a...>
Date: Tue, 2 Aug 2022 16:10:38 +0900 (JST)
Subject: [ruby-changes:72777] 6ec8f684aa (master): [rubygems/rubygems] Move some logic to `LazySpecification#__materialize__`
https://git.ruby-lang.org/ruby.git/commit/?id=6ec8f684aa From 6ec8f684aa1ff6182b4be3fc67b2fa5bad3f0bec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Thu, 14 Jul 2022 22:22:54 +0200 Subject: [rubygems/rubygems] Move some logic to `LazySpecification#__materialize__` https://github.com/rubygems/rubygems/commit/5e100df7c9 --- lib/bundler/lazy_specification.rb | 2 ++ lib/bundler/spec_set.rb | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bundler/lazy_specification.rb b/lib/bundler/lazy_specification.rb index 21e75d2126..ff9444e009 100644 --- a/lib/bundler/lazy_specification.rb +++ b/lib/bundler/lazy_specification.rb @@ -76,6 +76,8 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/lazy_specification.rb#L76 end def materialize_for_installation + source.local! + __materialize__(ruby_platform_materializes_to_ruby_platform? ? platform : Bundler.local_platform) end diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index a7a95e49bc..4e339ffe91 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -70,7 +70,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/spec_set.rb#L70 materialized.map! do |s| next s unless s.is_a?(LazySpecification) - s.source.local! s.materialize_for_installation || s end SpecSet.new(materialized) @@ -82,7 +81,6 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/spec_set.rb#L81 def materialized_for_all_platforms @specs.map do |s| next s unless s.is_a?(LazySpecification) - s.source.local! s.source.remote! spec = s.materialize_for_installation raise GemNotFound, "Could not find #{s.full_name} in any of the sources" unless spec -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/