[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[Gerhard Lausser]

The following commit has been merged in the debian/master branch:
commit 7119412a163438231fb721cee5c4a449e3ce52fa
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sun Feb 5 20:12:28 2012 +0100

    Fix issue #155 again. The shell error message looks different for ubuntu

diff --git a/shinken/action.py b/shinken/action.py
index 95ab258..0c0959c 100644
--- a/shinken/action.py
+++ b/shinken/action.py
@@ -133,7 +133,7 @@ class __Action(object):
         # TODO : Anormal should be logged properly no?
         if self.exit_status not in valid_exit_status:
             stdoutdata = stdoutdata + stderrdata
-        elif 'sh: -c: line 0: unexpected EOF while looking for matching' in stderrdata:
+        elif 'sh: -c: line 0: unexpected EOF while looking for matching' in stderrdata or 'sh: Syntax error: Unterminated quoted string' in stderrdata:
             # Very, very ugly. But subprocess._handle_exitstatus does not see
             # a difference between a regular "exit 1" and a bailing out shell.
             # Strange, because strace clearly shows a difference. (exit_group(1) vs. exit_group(257))

-- 
UNNAMED PROJECT