summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2020-05-28 23:00:19 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-06-05 07:32:42 +0900
commit97d05c9db38f92b214cd30bb821ce29add20f082 (patch)
tree6aee4cf2b0eac69dd58db3812fa662e485ab499c /lib
parent332ecb0ad1fd5cda138a36cc40891d78517d1fff (diff)
[rubygems/rubygems] Remove unnecessary option mutation
https://github.com/rubygems/rubygems/commit/744c03d144
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3184
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/cli/install.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index dcd8d7cf7d..ed21485170 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -161,14 +161,11 @@ module Bundler
without |= Bundler.settings[:without].map(&:to_s)
without -= options[:with] if options[:with]
- options[:with] = with
- options[:without] = without
-
# 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]
+ Bundler.settings.set_command_option :without, without - with
+ Bundler.settings.set_command_option :with, with
end
def normalize_settings