Tabs vs. spaces.

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index b4b0d6b..e7d3fd3 100755 (executable)
--- a/nm.py
+++ b/nm.py
@@ -31,12 +31,7 @@ savedargv = sys.argv[:]
 # NOTE: modules listed here should also be loaded in this order
 known_modules=['net','conf_files', 'sm', 'bwmon']
 
-# Deal with plugins directory
 plugin_path = "/usr/share/NodeManager/plugins"
-if os.path.exists(plugin_path):
-    sys.path.append(plugin_path)
-    known_modules += [i[:-3] for i in os.listdir(plugin_path) if i.endswith(".py") and (i[:-3] not in known_modules)]
-
 
 parser = optparse.OptionParser()
 parser.add_option('-d', '--daemon', action='store_true', dest='daemon', default=False, help='run daemonized')
@@ -91,7 +86,7 @@ def getPLCDefaults(data, config):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
             return 
-    if 'OVERRIDES' in dir(config): del config.OVERRIDES
+    if 'OVERRIDES' not in dir(config): del config.OVERRIDES
 
 
 def run():