[checkmk-commits] Check_MK Git: check_mk: #1865 FIX mkeventd: fixed exception when executing a shell script as action

Module: check_mk Branch: master Commit: 664519906748f82fa1ac91c78a0acd26dddad661 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=664519906748f8… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 4 17:32:33 2015 +0100 #1865 FIX mkeventd: fixed exception when executing a shell script as action --- .werks/1865 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1865 b/.werks/1865 new file mode 100644 index 0000000..a0a46d2 --- /dev/null +++ b/.werks/1865 @@ -0,0 +1,9 @@ +Title: mkeventd: fixed exception when executing a shell script as action +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i1 +Date: 1425486701 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 31464d0..d82195d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -347,6 +347,7 @@ * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured * 1974 FIX: Event console views were randomly ignoring host filters... * 1861 FIX: exception in mkeventd when archiving certain event log lines + * 1865 FIX: mkeventd: fixed exception when executing a shell script as action HW/SW-Inventory: * 1846 Keep track of changes of software and hardware... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f9257e7..65fd75a 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3208,7 +3208,7 @@ def substitute_event_tags(text, event): for key, value in substs: if type(value) == tuple: - value = " ".join(value) + value = " ".join(map(str,value)) elif type(value) not in [ str, unicode ]: value = str(value)