diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2023-10-04 20:08:14 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-10-16 13:52:55 +0900 |
commit | a1c73f1c881aab95bf3ed5316f2d6de62bba90d1 (patch) | |
tree | d9142fdd6968c220501f5322aca235c7908ef75d /lib/bundler | |
parent | a05904c8cefdf16feb164240f8aff0f83d43e75a (diff) | |
download | ruby-a1c73f1c881aab95bf3ed5316f2d6de62bba90d1.tar.gz |
[rubygems/rubygems] Consistent usage of `local_platform` in Definition
https://github.com/rubygems/rubygems/commit/5f28a68d79
Diffstat (limited to 'lib/bundler')
-rw-r--r-- | lib/bundler/definition.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index cbdcde40b5..454b1d3d54 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -452,8 +452,8 @@ module Bundler return if current_platform_locked? raise ProductionError, "Your bundle only supports platforms #{@platforms.map(&:to_s)} " \ - "but your local platform is #{Bundler.local_platform}. " \ - "Add the current platform to the lockfile with\n`bundle lock --add-platform #{Bundler.local_platform}` and try again." + "but your local platform is #{local_platform}. " \ + "Add the current platform to the lockfile with\n`bundle lock --add-platform #{local_platform}` and try again." end def add_platform(platform) @@ -600,7 +600,7 @@ module Bundler def current_platform_locked? @platforms.any? do |bundle_platform| - MatchPlatform.platforms_match?(bundle_platform, Bundler.local_platform) + MatchPlatform.platforms_match?(bundle_platform, local_platform) end end @@ -958,7 +958,7 @@ module Bundler def remove_ruby_from_platforms_if_necessary!(dependencies) return if Bundler.frozen_bundle? || - Bundler.local_platform == Gem::Platform::RUBY || + local_platform == Gem::Platform::RUBY || !platforms.include?(Gem::Platform::RUBY) || (@new_platform && platforms.last == Gem::Platform::RUBY) || @path_changes || |