Merge rubygems/bundler HEAD.

Pick from dfbb5a3811
This commit is contained in:
Hiroshi SHIBATA 2022-08-09 11:16:07 +09:00
parent f8936b3341
commit 44264b4fee
Notes: git 2022-08-09 12:05:48 +09:00
80 changed files with 312 additions and 286 deletions

View file

@ -88,7 +88,7 @@ Specific fields in the specification can be extracted in YAML format:
raise Gem::CommandLineError, "Unsupported version type: '#{v}'"
end
if !req.none? and options[:all]
if !req.none? && options[:all]
alert_error "Specify --all or -v, not both"
terminate_interaction 1
end
@ -102,7 +102,7 @@ Specific fields in the specification can be extracted in YAML format:
field = get_one_optional_argument
raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive" if
field and options[:format] == :ruby
field && options[:format] == :ruby
if local?
if File.exist? gem