formatting

[nodemanager.git] / nm.py

diff --git a/nm.py b/nm.py
index e7d3fd3..c262906 100755 (executable)
--- 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