summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorColby Swandale <colby@taplaboratories.com>2017-05-17 07:58:19 +1000
committerColby Swandale <colby@taplaboratories.com>2017-05-17 07:58:19 +1000
commit0be134195bcb1b79b598def4333e36d7eac9b35e (patch)
treed4b5e84c4436b96d5c0aadd8d524323ae2e2b883 /lib/bundler
parent7a47ace072df309b7fd8020bce1ef56548ba2cce (diff)
downloadbundler-0be134195bcb1b79b598def4333e36d7eac9b35e.tar.gz
stderr feature flag is notw error_on_stderr
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/feature_flag.rb2
-rw-r--r--lib/bundler/settings.rb2
-rw-r--r--lib/bundler/ui/shell.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index 3bbc7de5d9..5ee69f538c 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -17,7 +17,7 @@ module Bundler
settings_flag(:allow_offline_install) { bundler_2_mode? }
settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
- settings_flag(:stderr) { bundler_2_mode? }
+ settings_flag(:error_on_stderr) { bundler_2_mode? }
def initialize(bundler_version)
@bundler_version = Gem::Version.create(bundler_version)
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index a43e40366f..9a93eebf83 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -27,7 +27,7 @@ module Bundler
only_update_to_newer_versions
plugins
silence_root_warning
- stderr
+ error_on_stderr
).freeze
NUMBER_KEYS = %w(
diff --git a/lib/bundler/ui/shell.rb b/lib/bundler/ui/shell.rb
index 98c3206337..24429d1229 100644
--- a/lib/bundler/ui/shell.rb
+++ b/lib/bundler/ui/shell.rb
@@ -37,7 +37,7 @@ module Bundler
def error(msg, newline = nil)
return unless level("error")
- return tell_err(msg, :red, newline) if Bundler.feature_flag.stderr?
+ return tell_err(msg, :red, newline) if Bundler.feature_flag.error_on_stderr?
tell_me(msg, :red, newline)
end