Skip to content
Snippets Groups Projects
Unverified Commit 9de23547 authored by Thomas Woerner's avatar Thomas Woerner Committed by GitHub
Browse files

Merge pull request #997 from rjeffman/environment_fix_setting_order

environment: Fix os.environ language setting.
parents a55b4a24 76aad719
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,9 @@ __all__ = ["gssapi", "netaddr", "api", "ipalib_errors", "Env", ...@@ -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: ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment