summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2014-09-26 15:27:06 -0400
committerBryan McLellan <btm@loftninjas.org>2014-09-26 15:27:06 -0400
commit6c892b3832299886c311e4f5c707f9705fae0138 (patch)
tree322b99b7d2a19a5f2e5550b11fda040ea4018ce3
parent791232c8e08743447fd2a1bf4eb69b87e5d24c00 (diff)
downloadchef-btm/windows-locale.tar.gz
Quietly keep locale en_US.UTF-8 on Windowsbtm/windows-locale
We're not sure if anything cares what we set the locale to this way on Windows. For now we'll leave it as en_US.UTF-8 until we find a use case that indicates we should do something else.
-rw-r--r--lib/chef/config.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index 74607e8368..107b50ee85 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -619,7 +619,11 @@ class Chef
'C'
end
rescue
- Chef::Log.warn "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+ if Chef::Platform.windows?
+ Chef::Log.debug "Defaulting to locale en_US.UTF-8 on Windows, until it matters that we do something else."
+ else
+ Chef::Log.warn "No usable locale -a command found, assuming you have en_US.UTF-8 installed."
+ end
'en_US.UTF-8'
end
end