[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 ec850636bd2424796b2c4c9091f621cca381adb5
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sat Feb 4 13:23:23 2012 +0100

    Fix issue #155 also for windows

diff --git a/shinken/action.py b/shinken/action.py
index 4c22329..1e0c0d3 100644
--- a/shinken/action.py
+++ b/shinken/action.py
@@ -228,7 +228,14 @@ else:
             if sys.version_info < (2, 7):
                 cmd = self.command
             else:
-                cmd = shlex.split(self.command.encode('utf8', 'ignore'))
+                try:
+                    cmd = shlex.split(self.command.encode('utf8', 'ignore'))
+                except Exception, exp:
+                    self.output = 'Not a valid shell command: ' + exp.__str__()
+                    self.exit_status = 3
+                    self.status = 'done'
+                    self.execution_time = time.time() - self.check_time
+                    return
 
             try:
                 self.process = subprocess.Popen(cmd,

-- 
UNNAMED PROJECT