From 663d76dbb63724e18f2be4fffc73e620ac3f84a6 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Tue, 25 Aug 2015 10:57:10 +0200 Subject: [PATCH] policycoreutils: audit2* - ignore setlocale errors When a user has invalid locales set, audit2allow and audit2why fail with a traceback. This could be safely ignored as it will stay with 'C' locale. Fixes: Traceback (most recent call last): File "policycoreutils/audit2allow/audit2allow", line 35, in locale.setlocale(locale.LC_ALL, '') File "/usr/lib64/python2.7/locale.py", line 579, in setlocale return _setlocale(category, locale) locale.Error: unsupported locale setting Signed-off-by: Petr Lautrbach --- policycoreutils/audit2allow/audit2allow | 5 ++++- policycoreutils/audit2allow/audit2why | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/policycoreutils/audit2allow/audit2allow b/policycoreutils/audit2allow/audit2allow index 6bbab408..e23e418b 100644 --- a/policycoreutils/audit2allow/audit2allow +++ b/policycoreutils/audit2allow/audit2allow @@ -32,7 +32,10 @@ import sepolgen.module as module from sepolgen.sepolgeni18n import _ import selinux.audit2why as audit2why import locale -locale.setlocale(locale.LC_ALL, '') +try: + locale.setlocale(locale.LC_ALL, '') +except: + pass class AuditToPolicy: diff --git a/policycoreutils/audit2allow/audit2why b/policycoreutils/audit2allow/audit2why index 3909b972..b1489eda 100644 --- a/policycoreutils/audit2allow/audit2why +++ b/policycoreutils/audit2allow/audit2why @@ -32,7 +32,10 @@ import sepolgen.module as module from sepolgen.sepolgeni18n import _ import selinux.audit2why as audit2why import locale -locale.setlocale(locale.LC_ALL, '') +try: + locale.setlocale(locale.LC_ALL, '') +except: + pass class AuditToPolicy: