diff options
author | James Cammarata <jimi@sngx.net> | 2016-04-06 12:19:22 -0400 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2016-04-06 12:19:22 -0400 |
commit | 040893a67771ca1a9ba0628766bd6a0c36f9ac6c (patch) | |
tree | 37f8ad3ba0968cb0661feb1d6044118a2d1c68f0 /lib/ansible/plugins/shell/__init__.py | |
parent | edab8d338d045e3692bce15503a2ec08cf65929b (diff) | |
download | ansible-040893a67771ca1a9ba0628766bd6a0c36f9ac6c.tar.gz |
Adding a config option to allow disabling locale settings upon module exec
Fixes #15138
Diffstat (limited to 'lib/ansible/plugins/shell/__init__.py')
-rw-r--r-- | lib/ansible/plugins/shell/__init__.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/ansible/plugins/shell/__init__.py b/lib/ansible/plugins/shell/__init__.py index bef4541039..c8224eaf7a 100644 --- a/lib/ansible/plugins/shell/__init__.py +++ b/lib/ansible/plugins/shell/__init__.py @@ -31,11 +31,15 @@ _USER_HOME_PATH_RE = re.compile(r'^~[_.A-Za-z0-9][-_.A-Za-z0-9]*$') class ShellBase(object): def __init__(self): - self.env = dict( - LANG = C.DEFAULT_MODULE_LANG, - LC_ALL = C.DEFAULT_MODULE_LANG, - LC_MESSAGES = C.DEFAULT_MODULE_LANG, - ) + self.env = dict() + if C.DEFAULT_MODULE_SET_LOCALE: + self.env.update( + dict( + LANG = C.DEFAULT_MODULE_LANG, + LC_ALL = C.DEFAULT_MODULE_LANG, + LC_MESSAGES = C.DEFAULT_MODULE_LANG, + ) + ) def env_prefix(self, **kwargs): env = self.env.copy() |