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

[rubygems/rubygems] Materialize platforms strictly on Windows too

Browse Source 
https://github.com/rubygems/rubygems/commit/ab11545f80
This commit is contained in:
David Rodríguez 2022-10-11 01:36:04 +02:00 committed by Hiroshi SHIBATA
parent 4d3dbbe77e
commit cb63a3f4c1
Notes: git 2022-10-18 07:33:39 +00:00 
Merged: https://github.com/ruby/ruby/pull/6578
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/bundler/lazy_specification.rb
View File

@ -151,7 +151,8 @@ module Bundler
# #
# For backwards compatibility with existing lockfiles, if the most specific # For backwards compatibility with existing lockfiles, if the most specific
# locked platform is RUBY, we keep the previous behaviour of resolving the # locked platform is not a specific platform like x86_64-linux or
# universal-java-11, then we keep the previous behaviour of resolving the
# best platform variant at materiliazation time. For previous bundler # best platform variant at materiliazation time. For previous bundler
# versions (before 2.2.0) this was always the case (except when the lockfile # versions (before 2.2.0) this was always the case (except when the lockfile
# only included non-ruby platforms), but we're also keeping this behaviour # only included non-ruby platforms), but we're also keeping this behaviour
@ -159,7 +160,9 @@ module Bundler
# explicitly add a more specific platform. # explicitly add a more specific platform.
# #
def ruby_platform_materializes_to_ruby_platform? def ruby_platform_materializes_to_ruby_platform?
!Bundler.most_specific_locked_platform?(generic_local_platform) || force_ruby_platform || Bundler.settings[:force_ruby_platform] generic_platform = generic_local_platform == Gem::Platform::JAVA ? Gem::Platform::JAVA : Gem::Platform::RUBY
!Bundler.most_specific_locked_platform?(generic_platform) || force_ruby_platform || Bundler.settings[:force_ruby_platform]
end end
end end
end end