[checkmk-commits] Check_MK Git: check_mk: FIX Fixed exception in event simulator when one match group did not match

Module: check_mk Branch: master Commit: c7c88afcccc4313a51dff1a8389555b4bb2c4ef2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7c88afcccc431… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Mon Dec 16 15:25:42 2013 +0100 FIX Fixed exception in event simulator when one match group did not match --- .werks/359 | 8 ++++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/359 b/.werks/359 new file mode 100644 index 0000000..75f0eca --- /dev/null +++ b/.werks/359 @@ -0,0 +1,8 @@ +Title: Fixed exception in event simulator when one match group did not match +Level: 1 +Component: ec +Version: 1.2.5i1 +Date: 1387203915 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a9d1b67..8bd12a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * 0303 FIX: Old log entries were shown in event history first... * 0304 FIX: Escaping several unwanted chars from incoming log messages... * 0089 FIX: CSV export of event console was broken... + * 0359 FIX: Fixed exception in event simulator when one match group did not match Livestatus: * 0337 New header for limiting the execution time of a query... diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 655d23d..62dd9e5 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -923,7 +923,7 @@ def mode_mkeventd_rules(phase): icon = "rulematch" have_match = True if groups: - msg += _(" Match groups: %s") % ",".join(groups) + msg += _(" Match groups: %s") % ",".join([ g or _('&lt;None&gt;') for g in groups ]) html.icon(msg, icon) table.cell(_("ID"), '<a href="%s">%s</a>' % (edit_url, rule["id"]))