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

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit a14a3a7946d0b48d714c08fbfbcc4ec08eb4b1f1
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Tue Dec 27 16:25:12 2011 +0100

    removed unused code

diff --git a/contrib/alternative-installation/shinken-install/tools/skonf.py b/contrib/alternative-installation/shinken-install/tools/skonf.py
index e20dc28..f124ace 100755
--- a/contrib/alternative-installation/shinken-install/tools/skonf.py
+++ b/contrib/alternative-installation/shinken-install/tools/skonf.py
@@ -7,15 +7,15 @@ import datetime
 import copy
 import socket
 
-try:
-    from shinken.bin import VERSION
-    import shinken
-except ImportError:
-    # If importing shinken fails, try to load from current directory
-    # or parent directory to support running without installation.
-    # Submodules will then be loaded from there, too.
-    import imp
-    imp.load_module('shinken', *imp.find_module('shinken', [os.path.realpath("."), os.path.realpath(".."), os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "..")]))
+#try:
+#    from shinken.bin import VERSION
+#    import shinken
+#except ImportError:
+#    # If importing shinken fails, try to load from current directory
+#    # or parent directory to support running without installation.
+#    # Submodules will then be loaded from there, too.
+#    import imp
+#    imp.load_module('shinken', *imp.find_module('shinken', [os.path.realpath("."), os.path.realpath(".."), os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), "..")]))
 
 
 from shinken.bin import VERSION

-- 
UNNAMED PROJECT