From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 9 Jul 2009 02:27:34 +0000 (+0000)
Subject: sync up with what's on the branch
X-Git-Tag: NodeManager-1.8-8~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e77638ac67ea7a0f45386c5d1ac63e74c3f1b773;hp=544158b1b52bd18b9942b122ce804f59cc929e25;p=nodemanager.git

sync up with what's on the branch
---

diff --git a/nm.py b/nm.py
index b4b0d6b..62d9ece 100755
--- 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')