summaryrefslogtreecommitdiff
path: root/lib/bundler/source
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-08-28 09:48:10 -0500
committerSamuel Giddins <segiddins@segiddins.me>2017-08-28 09:48:18 -0500
commit6101d6276bceb8bf0f687a3fdb5cbae3847e8598 (patch)
tree112988ed94722486eeb4d8520b74cf89b2a96363 /lib/bundler/source
parent616394788ededa17409ec893d8befe9f683b54fb (diff)
downloadbundler-6101d6276bceb8bf0f687a3fdb5cbae3847e8598.tar.gz
Completely remove the package --all option on 2.0 and force its behaviorseg-bundler-2-defaults
Diffstat (limited to 'lib/bundler/source')
-rw-r--r--lib/bundler/source/git.rb2
-rw-r--r--lib/bundler/source/path.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb
index c66cbb17fb..97bc1724a0 100644
--- a/lib/bundler/source/git.rb
+++ b/lib/bundler/source/git.rb
@@ -187,7 +187,7 @@ module Bundler
def cache(spec, custom_path = nil)
app_cache_path = app_cache_path(custom_path)
- return unless Bundler.settings[:cache_all]
+ return unless Bundler.feature_flag.cache_all?
return if path == app_cache_path
cached!
FileUtils.rm_rf(app_cache_path)
diff --git a/lib/bundler/source/path.rb b/lib/bundler/source/path.rb
index afd8723168..ed734bf549 100644
--- a/lib/bundler/source/path.rb
+++ b/lib/bundler/source/path.rb
@@ -84,7 +84,7 @@ module Bundler
def cache(spec, custom_path = nil)
app_cache_path = app_cache_path(custom_path)
- return unless Bundler.settings[:cache_all]
+ return unless Bundler.feature_flag.cache_all?
return if expand(@original_path).to_s.index(root_path.to_s + "/") == 0
unless @original_path.exist?