[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 656aa131d6f8856fe75b3648260a7ad9564a970d
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Tue Nov 22 00:23:30 2011 +0100

    *replace BaseException with Exception (crash python 2.4)

diff --git a/shinken/modules/graphite_ui.py b/shinken/modules/graphite_ui.py
index f3a1278..068285f 100644
--- a/shinken/modules/graphite_ui.py
+++ b/shinken/modules/graphite_ui.py
@@ -49,7 +49,7 @@ class Graphite_Webui(BaseModule):
         self.uri = getattr(modconf, 'uri', None)
         
         if not self.uri:
-            raise BaseException('The WebUI Graphite module is missing uri parameter.')
+            raise Exception('The WebUI Graphite module is missing uri parameter.')
 
         self.uri = self.uri.strip()
         if not self.uri.endswith('/'):
diff --git a/shinken/modules/npcdmod_broker.py b/shinken/modules/npcdmod_broker.py
index 42e87c0..fc06371 100644
--- a/shinken/modules/npcdmod_broker.py
+++ b/shinken/modules/npcdmod_broker.py
@@ -73,16 +73,16 @@ class Npcd_broker(BaseModule):
 
         if self.config_file and not self.process_config_file():
             print "npcdmod: An error occurred process your config file. Check your perfdata_file or perfdata_spool_dir"
-            raise BaseException('npcdmod: An error occurred process your config file. Check your perfdata_file or perfdata_spool_dir')
+            raise Exception('npcdmod: An error occurred process your config file. Check your perfdata_file or perfdata_spool_dir')
         if not self.perfdata_spool_dir and not self.perfdata_file:
             print "npcdmod: An error occurred while attempting to process module arguments"
-            raise BaseException('npcdmod: An error occurred while attempting to process module arguments')
+            raise Exception('npcdmod: An error occurred while attempting to process module arguments')
         try:
             # We open the file with line buffering, so we can better watch it with tail -f
             self.logfile = codecs.open(self.perfdata_file, 'a','utf-8','replace', 1)
         except:
             print "could not open file %s" % self.perfdata_file
-            raise BaseException('could not open file %s" % self.perfdata_file')
+            raise Exception('could not open file %s" % self.perfdata_file')
         # use so we do nto ask a reinit ofan instance too quickly
         self.last_need_data_send = time.time()
 
diff --git a/shinken/modules/pnp_ui.py b/shinken/modules/pnp_ui.py
index 1276802..d10feac 100644
--- a/shinken/modules/pnp_ui.py
+++ b/shinken/modules/pnp_ui.py
@@ -50,7 +50,7 @@ class PNP_Webui(BaseModule):
         self.password = getattr(modconf, 'password', '')
         
         if not self.uri:
-            raise BaseException('The WebUI PNP module is missing uri parameter.')
+            raise Exception('The WebUI PNP module is missing uri parameter.')
 
         self.uri = self.uri.strip()
         if not self.uri.endswith('/'):
diff --git a/shinken/satellite.py b/shinken/satellite.py
index 625b98f..f4dec89 100644
--- a/shinken/satellite.py
+++ b/shinken/satellite.py
@@ -83,7 +83,7 @@ Pyro_exp_pack = (Pyro.errors.ProtocolError, Pyro.errors.URIError, \
 
 # Class for say we are facing a non worker module
 # but a standard one
-class NotWorkerMod(BaseException):
+class NotWorkerMod(Exception):
    pass
 
 

-- 
UNNAMED PROJECT