[checkmk-commits] Check_MK Git: check_mk: #2139 FIX Fix exception in Event Console when archiving events with match groups and non ASCII characters

Module: check_mk Branch: master Commit: 3c5e3976bfa688a534f1e5ca027a33d85e0454af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c5e3976bfa688… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 16 13:41:45 2015 +0100 #2139 FIX Fix exception in Event Console when archiving events with match groups and non ASCII characters --- .werks/2139 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/2139 b/.werks/2139 new file mode 100644 index 0000000..7471521 --- /dev/null +++ b/.werks/2139 @@ -0,0 +1,9 @@ +Title: Fix exception in Event Console when archiving events with match groups and non ASCII characters +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1426509629 + diff --git a/ChangeLog b/ChangeLog index e86bb36..0b22b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -390,6 +390,7 @@ * 1861 FIX: exception in mkeventd when archiving certain event log lines * 1865 FIX: mkeventd: fixed exception when executing a shell script as action * 2133 FIX: Fix visualization of global EC setting for Rule Optimizer... + * 2139 FIX: Fix exception in Event Console when archiving events with match groups and non ASCII characters HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 65fd75a..aa00f3e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -681,7 +681,7 @@ def quote_tab(col): if type(col) in [ float, int ]: return str(col) elif type(col) in [ tuple, list ]: - col = "\1" + "\1".join(map(str, col)) + col = "\1" + "\1".join(map(to_utf8, col)) elif col == None: col = "\2"