X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nm.py;h=c26290644c0a9a57ad7eeb3edfb45f3d06b4233b;hb=0ba47ab6fef533138f5a9c486ad9706800c25a0f;hp=e7d3fd3155646c7b55cbdad577b0c385da92de82;hpb=97d17a690717546c34c011a7982bb784fcee4314;p=nodemanager.git

diff --git a/nm.py b/nm.py
index e7d3fd3..c262906 100755
--- a/nm.py
+++ b/nm.py
@@ -85,8 +85,7 @@ def getPLCDefaults(data, config):
             if len(attr_dict):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
-            return 
-    if 'OVERRIDES' not in dir(config): del config.OVERRIDES
+        elif 'OVERRIDES' in dir(config): del config.OVERRIDES
 
 
 def run():
@@ -146,13 +145,6 @@ def run():
 
 if __name__ == '__main__':
     logger.log("Entering nm.py "+id)
-    stacklim = 512*1024  # 0.5 MiB
-    curlim = resource.getrlimit(resource.RLIMIT_STACK)[0]  # soft limit
-    if curlim > stacklim:
-        resource.setrlimit(resource.RLIMIT_STACK, (stacklim, stacklim))
-        # for some reason, doesn't take effect properly without the exec()
-        python = '/usr/bin/python'
-        os.execv(python, [python] + savedargv)
     run()
 else:
     # This is for debugging purposes.  Open a copy of Python and import nm