Merge branch 'mathieumd-devel' into devel

pull/12857/head
James Cammarata 9 years ago
commit c642fe4b84

@ -1039,8 +1039,8 @@ class AnsibleModule(object):
# issues but is preferable to simply failing because # issues but is preferable to simply failing because
# of an unknown locale # of an unknown locale
locale.setlocale(locale.LC_ALL, 'C') locale.setlocale(locale.LC_ALL, 'C')
os.environ['LANG'] = 'C' os.environ['LANG'] = 'C'
os.environ['LC_CTYPE'] = 'C' os.environ['LC_ALL'] = 'C'
os.environ['LC_MESSAGES'] = 'C' os.environ['LC_MESSAGES'] = 'C'
except Exception: except Exception:
e = get_exception() e = get_exception()

@ -38,7 +38,7 @@ class ShellModule(object):
'''Build command prefix with environment variables.''' '''Build command prefix with environment variables.'''
env = dict( env = dict(
LANG = C.DEFAULT_MODULE_LANG, LANG = C.DEFAULT_MODULE_LANG,
LC_CTYPE = C.DEFAULT_MODULE_LANG, LC_ALL = C.DEFAULT_MODULE_LANG,
LC_MESSAGES = C.DEFAULT_MODULE_LANG, LC_MESSAGES = C.DEFAULT_MODULE_LANG,
) )
env.update(kwargs) env.update(kwargs)

Loading…
Cancel
Save