diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-25 06:27:56 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-12-25 07:40:52 +0900 |
| commit | da6a5e3ed16ab0cdda7546dd9caf55c59be7b86f (patch) | |
| tree | bd6f624e694dc6b96ce429c1100d3ab240001c19 /lib/bundler/cli | |
| parent | 2b2115318b4ee236ef61a3450bf85b16e591006d (diff) | |
Merge RubyGems-3.3.3 and Bundler-2.3.3
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/5342
Diffstat (limited to 'lib/bundler/cli')
| -rw-r--r-- | lib/bundler/cli/install.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 85f702bc64..c3400c3959 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -165,9 +165,6 @@ 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 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 Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil? |