archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-21 19:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge RubyGems-3.3.20 and Bundler-2.3.20

Browse source
This commit is contained in:
Hiroshi SHIBATA 2022-08-22 11:50:00 +09:00 • committed by nagachika
parent 44c926f3a9
commit 522b75f1b6
135 changed files with 1131 additions and 613 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/rubygems/request_set/gem_dependency_api.rb
View file

@ -371,7 +371,7 @@ class Gem::RequestSet::GemDependencyAPI
duplicate = @dependencies.include? name
@dependencies[name] =
if requirements.empty? and not source_set
if requirements.empty? && !source_set
Gem::Requirement.default
elsif source_set
Gem::Requirement.source_set
@ -789,7 +789,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
raise ArgumentError,
"You must specify engine_version along with the Ruby engine" if
engine and not engine_version
engine && !engine_version
return true if @installing
@ -800,7 +800,7 @@ Gem dependencies file #{@path} includes git reference for both ref/branch and ta
raise Gem::RubyVersionMismatch, message
end
if engine and engine != Gem.ruby_engine
if engine && engine != Gem.ruby_engine
message = "Your Ruby engine is #{Gem.ruby_engine}, " +
"but your #{gem_deps_file} requires #{engine}"