1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

[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
This commit is contained in:
David Rodríguez 2019-06-20 17:45:12 +02:00 committed by Hiroshi SHIBATA
parent 82bf064375
commit 81a84076c2
No known key found for this signature in database
GPG key ID: F9CF13417264FAC2

View file

@ -11,7 +11,6 @@ module Bundler
def run def run
Bundler.ui.level = "error" if options[:quiet] Bundler.ui.level = "error" if options[:quiet]
Bundler.settings.set_command_option_if_given :path, options[:path] 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"] Bundler.settings.set_command_option_if_given :cache_path, options["cache-path"]
setup_cache_all setup_cache_all
@ -19,8 +18,11 @@ module Bundler
# TODO: move cache contents here now that all bundles are locked # TODO: move cache contents here now that all bundles are locked
custom_path = Bundler.settings[:path] if options[:path] custom_path = Bundler.settings[:path] if options[:path]
Bundler.settings.temporary(:cache_all_platforms => options["all-platforms"]) do
Bundler.load.cache(custom_path) Bundler.load.cache(custom_path)
end end
end
private private