[checkmk-commits] Check_MK Git: check_mk: Prepare against invalid output from local -a

Module: check_mk Branch: master Commit: eed452adfac3ec3af8caf9f3629abdd4b9338560 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eed452adfac3ec… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 17:13:20 2013 +0100 Prepare against invalid output from local -a --- modules/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/notify.py b/modules/notify.py index c845081..e0b98ae 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -535,7 +535,7 @@ def notify_via_email(context, write_into_spoolfile): # Our resultion in future: use /usr/sbin/sendmail directly. # Our resultion in the present: look with locale -a for an existing UTF encoding # and use that. - for encoding in os.popen("locale -a"): + for encoding in os.popen("locale -a 2>/dev/null"): l = encoding.lower() if "utf8" in l or "utf-8" in l or "utf.8" in l: encoding = encoding.strip()