From 1e9818c0dacdb23ad20800fcc868d3d53ee8873f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 20 Jun 2019 17:45:12 +0200 Subject: Don't persist the cache_all_platforms setting We only want it temporarily during the duration of the cache saving. --- lib/bundler/cli/package.rb | 6 ++++-- 1 file 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 -- cgit v1.2.1