Re: [PATCH] policycoreutils: audit2* - ignore setlocale errors

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/25/2015 04:57 AM, Petr Lautrbach wrote:
> 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 <module>
>     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 <plautrba@xxxxxxxxxx>

Thanks, applied.

> ---
>  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 6bbab40..e23e418 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 3909b97..b1489ed 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:
> 

_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.



[Index of Archives]     [Selinux Refpolicy]     [Linux SGX]     [Fedora Users]     [Fedora Desktop]     [Yosemite Photos]     [Yosemite Camping]     [Yosemite Campsites]     [KDE Users]     [Gnome Users]

  Powered by Linux