[GRASS-SVN] r48989 - grass/trunk/lib/python

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Oct 29 13:04:08 EDT 2011


Author: martinl
Date: 2011-10-29 10:04:08 -0700 (Sat, 29 Oct 2011)
New Revision: 48989

Modified:
   grass/trunk/lib/python/task.py
Log:
pythonlib: fix `ignoreDefault` in task.get_cmd()


Modified: grass/trunk/lib/python/task.py
===================================================================
--- grass/trunk/lib/python/task.py	2011-10-29 16:52:29 UTC (rev 48988)
+++ grass/trunk/lib/python/task.py	2011-10-29 17:04:08 UTC (rev 48989)
@@ -220,8 +220,9 @@
                     cmd +=  [ '%s=%s' % (p['name'], _('<required>')) ]
             elif p.get('value', '') ==  '' and p.get('default', '') != '' and not ignoreDefault:
                 cmd +=  [ '%s=%s' % (p['name'], p['default']) ]
-            elif p.get('value', '') !=  '' and p['value'] !=  p.get('default','') :
-                # Output only values that have been set, and different from defaults
+            elif p.get('value', '') !=  '' and \
+                    (p['value'] !=  p.get('default', '') or not ignoreDefault):
+                # output only values that have been set, and different from defaults
                 cmd +=  [ '%s=%s' % (p['name'], p['value']) ]
         
         errList = self.get_cmd_error()



More information about the grass-commit mailing list