зеркало из https://github.com/github/ruby.git
[rubygems/rubygems] Consistent usage of `local_platform` in Definition
https://github.com/rubygems/rubygems/commit/5f28a68d79
This commit is contained in:
Родитель
a05904c8ce
Коммит
a1c73f1c88
|
@ -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 ||
|
||||
|
|
Загрузка…
Ссылка в новой задаче