mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-08-05 14:24:48 +00:00
Merge pull request #997 from rjeffman/environment_fix_setting_order
environment: Fix os.environ language setting.
This commit is contained in:
@@ -32,6 +32,9 @@ __all__ = ["gssapi", "netaddr", "api", "ipalib_errors", "Env",
|
|||||||
"load_pem_x509_certificate", "DNSName", "getargspec"]
|
"load_pem_x509_certificate", "DNSName", "getargspec"]
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
# ansible-freeipa requires locale to be C, IPA requires utf-8.
|
||||||
|
os.environ["LANGUAGE"] = "C"
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import operator
|
import operator
|
||||||
import tempfile
|
import tempfile
|
||||||
@@ -154,9 +157,6 @@ else:
|
|||||||
ANSIBLE_FREEIPA_MODULE_IMPORT_ERROR = None
|
ANSIBLE_FREEIPA_MODULE_IMPORT_ERROR = None
|
||||||
|
|
||||||
|
|
||||||
# ansible-freeipa requires locale to be C, IPA requires utf-8.
|
|
||||||
os.environ["LANGUAGE"] = "C"
|
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user