summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-11-25 13:47:40 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2014-11-25 13:47:40 -0800
commit5bab29b02248a4468a7fbf7f6226c30255c3abe3 (patch)
treef9640cc5997df15f4915c3a7bbf95ef5bcd7bee8 /lib
parent2dcf8244fd6ad46930112f593e78e0b18851dab6 (diff)
parent3558cccb16ff48be806c3af093462c95d4cc9b04 (diff)
downloadchef-5bab29b02248a4468a7fbf7f6226c30255c3abe3.tar.gz
Merge pull request #2487 from opscode/lcg/fix-windows-warn
suppress locale -a warnings on windows
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/config.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index 08ce1a8ff6..538271de0e 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -632,7 +632,7 @@ class Chef
#
# For example, on CentOS 6 with ENV['LANG'] = "en_US.UTF-8",
# `locale -a`.split fails with ArgumentError invalid UTF-8 encoding.
- locales = shell_out_with_systems_locale("locale -a").stdout.split
+ locales = shell_out_with_systems_locale!("locale -a").stdout.split
case
when locales.include?('C.UTF-8')
'C.UTF-8'