summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-06-20 17:45:12 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:29:57 +0900
commit81a84076c21e89d9e0e1df1b4cea8bf2047b960d (patch)
treedce8c59aa6aaa5492403b6f1758cfc5945dde794 /lib
parent82bf064375361f3d662389a634ef0541a0a1fc3b (diff)
[bundler/bundler] Don't persist the cache_all_platforms setting
We only want it temporarily during the duration of the cache saving. https://github.com/bundler/bundler/commit/1e9818c0da
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/cli/package.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler/cli/package.rb b/lib/bundler/cli/package.rb
index 3293b5512b..3fa87ff265 100644
--- a/lib/bundler/cli/package.rb
+++ b/lib/bundler/cli/package.rb
@@ -11,7 +11,6 @@ module Bundler
def run
Bundler.ui.level = "error" if options[:quiet]
Bundler.settings.set_command_option_if_given :path, options[:path]
- Bundler.settings.set_command_option_if_given :cache_all_platforms, options["all-platforms"]
Bundler.settings.set_command_option_if_given :cache_path, options["cache-path"]
setup_cache_all
@@ -19,7 +18,10 @@ module Bundler
# TODO: move cache contents here now that all bundles are locked
custom_path = Bundler.settings[:path] if options[:path]
- Bundler.load.cache(custom_path)
+
+ Bundler.settings.temporary(:cache_all_platforms => options["all-platforms"]) do
+ Bundler.load.cache(custom_path)
+ end
end
private