mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
(Temporarily?) delay path changes and global cache changes
There are several issues with these which I'm not sure I'll have time to address properly. I prefer to keep our default branch in a releasable state just in case. Once they are fixed, this can be reverted.
This commit is contained in:
parent
48a79cd492
commit
95fdaa5c3b
6 changed files with 15 additions and 6 deletions
|
@ -130,7 +130,7 @@ module Bundler
|
|||
def self.clean_after_install?
|
||||
clean = Bundler.settings[:clean]
|
||||
return clean unless clean.nil?
|
||||
clean ||= Bundler.feature_flag.bundler_4_mode? && Bundler.settings[:path].nil?
|
||||
clean ||= Bundler.feature_flag.bundler_5_mode? && Bundler.settings[:path].nil?
|
||||
clean &&= !Bundler.use_system_gems?
|
||||
clean
|
||||
end
|
||||
|
|
|
@ -30,7 +30,7 @@ module Bundler
|
|||
settings_flag(:allow_offline_install) { bundler_4_mode? }
|
||||
settings_flag(:cache_all) { bundler_4_mode? }
|
||||
settings_flag(:forget_cli_options) { bundler_4_mode? }
|
||||
settings_flag(:global_gem_cache) { bundler_4_mode? }
|
||||
settings_flag(:global_gem_cache) { bundler_5_mode? }
|
||||
settings_flag(:lockfile_checksums) { bundler_4_mode? }
|
||||
settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
|
||||
settings_flag(:update_requires_all_flag) { bundler_5_mode? }
|
||||
|
|
|
@ -272,7 +272,7 @@ module Bundler
|
|||
def use_system_gems?
|
||||
return true if system_path
|
||||
return false if explicit_path
|
||||
!Bundler.feature_flag.bundler_4_mode?
|
||||
!Bundler.feature_flag.bundler_5_mode?
|
||||
end
|
||||
|
||||
def base_path
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue