diff options
| author | Bundlerbot <bot@bundler.io> | 2019-07-29 06:57:57 +0000 |
|---|---|---|
| committer | Bundlerbot <bot@bundler.io> | 2019-07-29 06:57:57 +0000 |
| commit | cdd2075c71e2426e6fd77c1a340620753b14669e (patch) | |
| tree | a338e294a149f7453667a6efb936ac1fa1542721 /lib | |
| parent | d875be710a1a5cccacdcc8eea4ffd49c1f036bb8 (diff) | |
| parent | 5b285685a4c5d516c9f7ed5149abf9505a4e9eaa (diff) | |
| download | bundler-cdd2075c71e2426e6fd77c1a340620753b14669e.tar.gz | |
Merge #7258
7258: Restore the removal of the `--all` flag for `bundle cache` in Bundler 3 r=indirect a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was that I accidentally restored this flag on Bundler 3 in #7249, but the plan still is to remove it.
### What was your diagnosis of the problem?
My diagnosis was that I need to remove it again.
### What is your fix for the problem, implemented in this PR?
My fix is to remove it.
### Why did you choose this fix out of the possible options?
I chose this fix because it's the original plan and makes sense.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/cli.rb | 7 | ||||
| -rw-r--r-- | lib/bundler/cli/package.rb | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index c7af38bcaf..2f35b83c36 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -411,9 +411,10 @@ module Bundler end desc "#{Bundler.feature_flag.bundler_3_mode? ? :cache : :package} [OPTIONS]", "Locks and then caches all of the gems into vendor/cache" - method_option "all", :type => :boolean, - :default => Bundler.feature_flag.cache_all?, - :banner => "Include all sources (including path and git)." + unless Bundler.feature_flag.cache_all? + method_option "all", :type => :boolean, + :banner => "Include all sources (including path and git)." + end method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not only the current one" method_option "cache-path", :type => :string, :banner => "Specify a different cache path than the default (vendor/cache)." diff --git a/lib/bundler/cli/package.rb b/lib/bundler/cli/package.rb index 731677b4ec..b31b67776d 100644 --- a/lib/bundler/cli/package.rb +++ b/lib/bundler/cli/package.rb @@ -34,7 +34,7 @@ module Bundler end def setup_cache_all - all = options.fetch(:all, Bundler.feature_flag.bundler_3_mode? || nil) + all = options.fetch(:all, Bundler.feature_flag.cache_all? || nil) Bundler.settings.set_command_option_if_given :cache_all, all |