summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-06-14 10:02:19 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-06-14 16:09:40 -0500
commitd34a2a79fcb21ef6feca54f0fd97369125f53f1c (patch)
tree6386846c25515302ad4b02adf9fd350beeec3f56
parenteb1ba073c87763a7c44224079913d75f761ef4ce (diff)
downloadbundler-d34a2a79fcb21ef6feca54f0fd97369125f53f1c.tar.gz
[Install] Avoid re-writing settings when they won’t change
This will avoid spurious deprecation warnings
-rw-r--r--lib/bundler/cli/install.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index d57cad1e3f..f36ca94821 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -208,10 +208,11 @@ module Bundler
Bundler.settings[:clean] = options["clean"] if options["clean"]
- Bundler.settings.without = options[:without]
- Bundler.settings.with = options[:with]
+ Bundler.settings.without = options[:without] unless Bundler.settings.without == options[:without]
+ Bundler.settings.with = options[:with] unless Bundler.settings.with == options[:with]
- Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? true : nil
+ disable_shared_gems = Bundler.settings[:path] ? true : nil
+ Bundler.settings[:disable_shared_gems] = disable_shared_gems unless Bundler.settings[:disable_shared_gems] == disable_shared_gems
end
def warn_ambiguous_gems