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

[olivierHa]

The following commit has been merged in the debian/master branch:
commit 572c7ab09fb0e03cebb5edbfba4af556b4d412a3
Author: olivierHa <olivier.hanesse at gmail.com>
Date:   Wed Jan 11 13:13:40 2012 +0100

    Fix: separator can be blank or semicolon for WaitObject header

diff --git a/shinken/modules/livestatus_broker/livestatus_wait_query.py b/shinken/modules/livestatus_broker/livestatus_wait_query.py
index 2df834a..12b86b5 100644
--- a/shinken/modules/livestatus_broker/livestatus_wait_query.py
+++ b/shinken/modules/livestatus_broker/livestatus_wait_query.py
@@ -66,9 +66,12 @@ class LiveStatusWaitQuery(LiveStatusQuery):
             elif keyword == 'WaitObject': # Pick a specific object by name
                 cmd, object = self.split_option(line)
                 # It's like Filter: name = %s
-                # Only for services it's host<blank>servicedesc
+                # Only for services it's host<blank>servicedesc, or host;servicedesc
                 if self.table == 'services':
-                    host_name, service_description = object.split(';', 1)
+                    if ';' in object:
+                        host_name, service_description = object.split(';', 1)
+                    else:
+                        host_name, service_description = object.split(' ', 1)
                     self.filtercolumns.append('host_name')
                     self.prefiltercolumns.append('host_name')
                     self.filter_stack.put(self.make_filter('=', 'host_name', host_name))

-- 
UNNAMED PROJECT