summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-01-24 12:04:11 +0100
committergit <svn-admin@ruby-lang.org>2022-01-26 13:09:31 +0900
commitc925d3b6689515f76dcfbb1dc419746dac6f0738 (patch)
treedda99b4a0dc2b8db41a708440a51c7f2be200ea7 /lib
parentcc8064ba2e046f384f446889c8525bf976733918 (diff)
[rubygems/rubygems] Fix `force_ruby_platform` ignored when lockfile includes the current specific platform
https://github.com/rubygems/rubygems/commit/9ca371adf8
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/definition.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index c31c41f76d..b4a860f519 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -496,6 +496,7 @@ module Bundler
def current_ruby_platform_locked?
return false unless generic_local_platform == Gem::Platform::RUBY
+ return false if Bundler.settings[:force_ruby_platform] && !@platforms.include?(Gem::Platform::RUBY)
current_platform_locked?
end