diff options
| author | James Cammarata <jimi@sngx.net> | 2015-10-21 19:59:51 +0200 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-10-21 19:59:51 +0200 |
| commit | 0e447e3f415fdf395bbb8a5634c8bf631755750f (patch) | |
| tree | c39fb057dcb1d80efafc15b9fd583da45dbb6b91 /lib | |
| parent | Return correct changed flag when using check mode with template and force=no (diff) | |
| parent | Fixes #11055 - Set locale via LC_ALL (diff) | |
| download | ansible-0e447e3f415fdf395bbb8a5634c8bf631755750f.tar.xz ansible-0e447e3f415fdf395bbb8a5634c8bf631755750f.zip | |
Merge branch 'devel' of https://github.com/mathieumd/ansible into mathieumd-devel
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/module_utils/basic.py | 4 | ||||
| -rw-r--r-- | lib/ansible/plugins/shell/sh.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py index 52e2f090ec..e14ebfa680 100644 --- a/lib/ansible/module_utils/basic.py +++ b/lib/ansible/module_utils/basic.py @@ -1039,8 +1039,8 @@ class AnsibleModule(object): # issues but is preferable to simply failing because # of an unknown locale locale.setlocale(locale.LC_ALL, 'C') - os.environ['LANG'] = 'C' - os.environ['LC_CTYPE'] = 'C' + os.environ['LANG'] = 'C' + os.environ['LC_ALL'] = 'C' os.environ['LC_MESSAGES'] = 'C' except Exception: e = get_exception() diff --git a/lib/ansible/plugins/shell/sh.py b/lib/ansible/plugins/shell/sh.py index e27827e974..cd765e413c 100644 --- a/lib/ansible/plugins/shell/sh.py +++ b/lib/ansible/plugins/shell/sh.py @@ -38,7 +38,7 @@ class ShellModule(object): '''Build command prefix with environment variables.''' env = dict( LANG = C.DEFAULT_MODULE_LANG, - LC_CTYPE = C.DEFAULT_MODULE_LANG, + LC_ALL = C.DEFAULT_MODULE_LANG, LC_MESSAGES = C.DEFAULT_MODULE_LANG, ) env.update(kwargs) |