From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Sat, 19 Sep 2009 19:55:30 +0000 (+0000)
Subject: fixing the logic for r14697 and adding a clarifying note.
X-Git-Tag: NodeManager-1.8-13~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=baee129c8faef3bc94edb4af05e171fabd2eb883;p=nodemanager.git

fixing the logic for r14697 and adding a clarifying note.
---

diff --git a/nm.py b/nm.py
index 85c9004..5531554 100755
--- a/nm.py
+++ b/nm.py
@@ -85,7 +85,11 @@ def getPLCDefaults(data, config):
             if len(attr_dict):
                 logger.verbose("Found default slice overrides.\n %s" % attr_dict)
                 config.OVERRIDES = attr_dict
-        elif 'OVERRIDES' in dir(config): del config.OVERRIDES
+                return
+    # NOTE: if an _default slice existed, it would have been found above and
+	# 		the routine would return.  Thus, if we've gotten here, then no default
+	# 		slice is bound to this node.
+    if 'OVERRIDES' in dir(config): del config.OVERRIDES
 
 
 def run():