Merge pull request #9636 from Batmat/fix-message-i18n-parsing-error

Setting LC_MESSAGES: prevent unparseable messages (fixes issue #9635)
This commit is contained in:
Brian Coca 2015-05-26 11:49:56 -04:00
commit 6000db7e5d
2 changed files with 2 additions and 0 deletions

View file

@ -868,6 +868,7 @@ class AnsibleModule(object):
locale.setlocale(locale.LC_ALL, 'C')
os.environ['LANG'] = 'C'
os.environ['LC_CTYPE'] = 'C'
os.environ['LC_MESSAGES'] = 'C'
except Exception, e:
self.fail_json(msg="An unknown error was encountered while attempting to validate the locale: %s" % e)

View file

@ -32,6 +32,7 @@ class ShellModule(object):
env = dict(
LANG = C.DEFAULT_MODULE_LANG,
LC_CTYPE = C.DEFAULT_MODULE_LANG,
LC_MESSAGES = C.DEFAULT_MODULE_LANG,
)
env.update(kwargs)
return ' '.join(['%s=%s' % (k, pipes.quote(unicode(v))) for k,v in env.items()])