kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[rubygems/rubygems] Move all without and with option handling together

Browse source 
https://github.com/rubygems/rubygems/commit/5e47879330
This commit is contained in:
David Rodríguez 2020-05-28 22:51:57 +02:00 committed by Hiroshi SHIBATA
parent 052d66050a
commit 6b7a0c0ca7
Notes: git 2020-06-05 07:34:00 +09:00 
Merged: https://github.com/ruby/ruby/pull/3184
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/bundler/cli/install.rb
View file

@ -12,8 +12,6 @@ module Bundler
warn_if_root
normalize_groups
Bundler::SharedHelpers.set_env "RB_USER_INSTALL", "1" if Bundler::FREEBSD
# Disable color in deployment mode
@ -165,6 +163,14 @@ module Bundler
options[:with] = with
options[:without] = without
unless Bundler.settings[:without] == options[:without] && Bundler.settings[:with] == options[:with]
# need to nil them out first to get around validation for backwards compatibility
Bundler.settings.set_command_option :without, nil
Bundler.settings.set_command_option :with, nil
Bundler.settings.set_command_option :without, options[:without] - options[:with]
Bundler.settings.set_command_option :with, options[:with]
end
end
def normalize_settings
@ -191,13 +197,7 @@ module Bundler
Bundler.settings.set_command_option_if_given :clean, options["clean"]
unless Bundler.settings[:without] == options[:without] && Bundler.settings[:with] == options[:with]
# need to nil them out first to get around validation for backwards compatibility
Bundler.settings.set_command_option :without, nil
Bundler.settings.set_command_option :with, nil
Bundler.settings.set_command_option :without, options[:without] - options[:with]
Bundler.settings.set_command_option :with, options[:with]
end
normalize_groups
options[:force] = options[:redownload]
end