moa show now shows if a variable is defined by a parent (recursively) […

…#19 state:resolved]
mfiers · Apr 28, 2011 · 2753b71 · 2753b71
1 parent 6d7a39c
commit 2753b71
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/lib/python/moa/jobConf.py b/lib/python/moa/jobConf.py
@@ -1,3 +1,4 @@
+
 # Copyright 2009-2011 Mark Fiers
 # The New Zealand Institute for Plant & Food Research
 # 
@@ -78,7 +79,8 @@ def save(self):
         self.localConf.save(self.jobConfFile, self.doNotSave)
 
     def setInJobConf(self, key):
-        if self.jobConf.has_key(key):
+        c = self._get_conf(key)
+        if c.has_key(key):
             return True
         else:
             return False
@@ -101,7 +103,13 @@ def _get_conf(self, key):
             return self.jobConf
         else:
             return self.localConf
-
+
+    def is_local(self, key):
+        if self.localConf.has_key(key):
+            return True
+        else:
+            return False
+
     def has_key(self, key):
         c = self._get_conf(key)
         if c.has_key(key):

diff --git a/lib/python/moa/plugin/configure.py b/lib/python/moa/plugin/configure.py
@@ -72,15 +72,21 @@ def configShow(job):
         if job.template.parameters[p].private == True:
             continue
 
+        isLocal = job.conf.is_local(p)
+
         if job.conf.setInJobConf(p):
-            moa.ui.fprint("{{bold}}%s\t%s{{reset}}" % (
-                p, job.conf[p]), f='jinja')
+            if not isLocal:
+                moa.ui.fprint("%s\t{{bold}}{{magenta}}%s{{reset}}\t(recursively defined)" % (
+                        p, job.conf[p]), f='jinja')
+            else:
+                moa.ui.fprint("%s\t{{bold}}%s{{reset}}" % (
+                        p, job.conf[p]), f='jinja')
         else:
             if job.template.parameters[p].optional:
-                moa.ui.fprint("{{blue}}%s\t%s{{reset}}" % (
+                moa.ui.fprint("%s\t{{blue}}%s{{reset}}" % (
                     p, job.conf[p]), f='jinja')
             else:
-                moa.ui.fprint("{{red}}%s\t%s{{reset}}" % (
+                moa.ui.fprint("%s\t{{red}}{{bold}}\t(undefined) %s{{reset}}" % (
                     p, job.conf[p]), f='jinja')
 
 def _unsetCallback(wd, vars):