From e5daa34805a9608df62433224902c6a8008f7b8a Mon Sep 17 00:00:00 2001 From: Cleber Rosa Date: Tue, 6 Sep 2016 17:25:59 -0300 Subject: [PATCH] Revert "avocado.core.sysinfo: Force LANG for sysinfo collection" This reverts commit 6cb8804991ea5f26c8bc26f7204133aae60d48dc. The rationale is that we should really use LC_ALL instead of LANG. --- avocado/core/sysinfo.py | 6 ------ etc/avocado/avocado.conf | 2 -- 2 files changed, 8 deletions(-) diff --git a/avocado/core/sysinfo.py b/avocado/core/sysinfo.py index 631f178b..19bb70ef 100644 --- a/avocado/core/sysinfo.py +++ b/avocado/core/sysinfo.py @@ -151,9 +151,6 @@ class Command(Collectible): env = os.environ.copy() if "PATH" not in env: env["PATH"] = "/usr/bin:/bin" - lang = settings.get_value("sysinfo.collect", "lang", str, None) - if lang: - env["LANG"] = lang logf_path = os.path.join(logdir, self.logf) stdin = open(os.devnull, "r") stdout = open(logf_path, "w") @@ -188,9 +185,6 @@ class Daemon(Command): env = os.environ.copy() if "PATH" not in env: env["PATH"] = "/usr/bin:/bin" - lang = settings.get_value("sysinfo.collect", "lang", str, None) - if lang: - env["LANG"] = lang logf_path = os.path.join(logdir, self.logf) stdin = open(os.devnull, "r") stdout = open(logf_path, "w") diff --git a/etc/avocado/avocado.conf b/etc/avocado/avocado.conf index 2b5b846a..af26b5dc 100644 --- a/etc/avocado/avocado.conf +++ b/etc/avocado/avocado.conf @@ -19,8 +19,6 @@ enabled = True installed_packages = False # Whether to run certain commands in bg to give extra job debug information profiler = False -# Force LANG for sysinfo collection -lang = C [sysinfo.collectibles] # File with list of commands that will be executed and have their output collected -- GitLab