diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-12-23 22:19:31 +0100 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-12-31 15:56:52 +0100 |
commit | 4d263d5087c3ccf54649ac2a10ba96cd0245e7b0 (patch) | |
tree | ffd80c47968df2e770dd1b6e8aa6555eb60c1639 /lib | |
parent | 4b1c59ee641287e0932a856cb5cece121856376e (diff) | |
download | bundler-4d263d5087c3ccf54649ac2a10ba96cd0245e7b0.tar.gz |
Unify deployment setting and flagimprove_deployment_flag
Previously, we were recommending `bundle config deployment true; bundle
install` as an alternative to `bundle install --deployment`, but they
were not working equally.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/cli/install.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index d823fb632f..ecd474971d 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -38,7 +38,8 @@ module Bundler if Bundler.feature_flag.deployment_means_frozen? Bundler.settings.set_command_option :deployment, true else - Bundler.settings.set_command_option :frozen, true + Bundler.settings.set_command_option :deployment, true if options[:deployment] + Bundler.settings.set_command_option :frozen, true if options[:frozen] end end @@ -169,7 +170,7 @@ module Bundler def normalize_settings Bundler.settings.set_command_option :path, nil if options[:system] Bundler.settings.temporary(:path_relative_to_cwd => false) do - Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment] + Bundler.settings.set_command_option :path, "vendor/bundle" if Bundler.settings[:deployment] && Bundler.settings[:path].nil? end Bundler.settings.set_command_option_if_given :path, options[:path] Bundler.settings.temporary(:path_relative_to_cwd => false) do |