git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel
[nodemanager.git]
/
nodemanager.py
diff --git
a/nodemanager.py
b/nodemanager.py
index
899bd64
..
68a8be4
100755
(executable)
--- a/
nodemanager.py
+++ b/
nodemanager.py
@@
-1,8
+1,5
@@
#!/usr/bin/python
#
#!/usr/bin/python
#
-# $Id$
-# $URL$
-#
# Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
#
# Useful information can be found at https://svn.planet-lab.org/wiki/NodeManager
#
@@
-199,7
+196,7
@@
If this is not the case, please remove the pid file %s. -- exiting""" % (other_p
try:
m = __import__(module)
logger.verbose("nodemanager: triggering %s.start"%m.__name__)
try:
m = __import__(module)
logger.verbose("nodemanager: triggering %s.start"%m.__name__)
- m.start(
self.options, config
)
+ m.start()
self.loaded_modules.append(m)
except ImportError, err:
print "Warning while loading module %s:" % module, err
self.loaded_modules.append(m)
except ImportError, err:
print "Warning while loading module %s:" % module, err