Allow a scape valve to keep the old behavior for now

1 files changed, 13 insertions, 7 deletions

diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index f8ee6fe3db..c1336acbb3 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -116,13 +116,19 @@ module Bundler
           "bundle config set #{key} #{Array(value).join(":")}"
         end
 
-        Bundler::SharedHelpers.major_deprecation 2,\
-          "flags passed to commands " \
-          "will no longer be automatically remembered. Instead please set flags " \
-          "you want remembered between commands using `bundle config set " \
-          "<setting name> <setting value>`, i.e. `#{command}`. Once you are " \
-          "ready for the new behavior, use `bundle config set forget_cli_options " \
-          "true` to get rid of this message"
+        unless Bundler.settings[:forget_cli_options] == false
+          Bundler::SharedHelpers.major_deprecation 2,\
+            "flags passed to commands " \
+            "will no longer be automatically remembered. Instead please set flags " \
+            "you want remembered between commands using `bundle config set " \
+            "<setting name> <setting value>`, i.e. `#{command}`. Once you are " \
+            "ready for the new behavior, use `bundle config set forget_cli_options " \
+            "true` to get rid of this message. Or if you want to get rid of " \
+            "this message and stick with the old behavior for now, run " \
+            "`bundle config set forget_cli_options false`, but keep in mind " \
+            "that this behavior will be fully removed in future versions of " \
+            "bundler."
+        end
 
         set_local(key, value)
       end