diff options
| author | Hiroshi SHIBATA <[email protected]> | 2022-08-09 11:16:07 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2022-08-09 12:05:19 +0900 |
| commit | 44264b4fee1e208e759710c39271186ff9856b40 () | |
| tree | 939a9810293c86553e7b600bce9fb426776f6000 /lib/rubygems/request_set/gem_dependency_api.rb | |
| parent | f8936b3341376948112e31f9e9b0cb3ad6e91e7c (diff) | |
Merge rubygems/bundler HEAD.
Pick from https://.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199
Notes: Merged: https://.com/ruby/ruby/pull/6224
| -rw-r--r-- | lib/rubygems/request_set/gem_dependency_api.rb | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -371,7 +371,7 @@ class Gem::RequestSet::GemDependencyAPI duplicate = @dependencies.include? name @dependencies[name] = - if requirements.empty? and not 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 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 message = "Your Ruby engine is #{Gem.ruby_engine}, " + "but your #{gem_deps_file} requires #{engine}" |