summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-07-07 20:01:36 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-07-19 13:10:39 -0500
commite7d9e9665ad3357eedd309b9ea4594e81be78395 (patch)
tree120f2c1039917f1712694c7e309212de3f1e1a88
parent8ccf49c3b4a086f1e0cad2130dc30c04304175b7 (diff)
downloadbundler-e7d9e9665ad3357eedd309b9ea4594e81be78395.tar.gz
[Settings] Remove #delete
Since it did not cause the changed config to be written to disk
-rw-r--r--lib/bundler/cli/install.rb4
-rw-r--r--lib/bundler/settings.rb4
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index 2601803513..9f81291941 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -54,7 +54,7 @@ module Bundler
# When install is called with --no-deployment, disable deployment mode
if options[:deployment] == false
- Bundler.settings.delete(:frozen)
+ Bundler.settings.set_command_option :frozen, nil
options[:system] = true
end
@@ -177,7 +177,7 @@ module Bundler
end
def normalize_settings
- Bundler.settings.delete(:path) if options[:system]
+ Bundler.settings.set_command_option :path, nil if options[:system]
Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
Bundler.settings.set_command_option_if_given :path, options["path"]
Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil?
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index eadc303374..6692389c99 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -131,10 +131,6 @@ module Bundler
end
end
- def delete(key)
- @local_config.delete(key_for(key))
- end
-
def set_global(key, value)
set_key(key, value, @global_config, global_config_file)
end