[GRASS-SVN] r56124 - grass/branches/releasebranch_6_4/scripts/r.mask

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-05-04 20:52:58 -0700 (Sat, 04 May 2013)
New Revision: 56124

Modified:
   grass/branches/releasebranch_6_4/scripts/r.mask/r.mask
Log:
minimal fix for #1525

Modified: grass/branches/releasebranch_6_4/scripts/r.mask/r.mask
===================================================================
--- grass/branches/releasebranch_6_4/scripts/r.mask/r.mask	2013-05-05 03:50:33 UTC (rev 56123)
+++ grass/branches/releasebranch_6_4/scripts/r.mask/r.mask	2013-05-05 03:52:58 UTC (rev 56124)
@@ -6,7 +6,7 @@
 # AUTHOR(S):	Michael Barton, Arizona State University
 #               Markus Neteler
 # PURPOSE:	    Facilitates creation of raster MASK using r.reclass
-# COPYRIGHT:	(C) 2005, 2007-2009 by the GRASS Development Team
+# COPYRIGHT:	(C) 2005-2013 by the GRASS Development Team
 #
 #		This program is free software under the GNU General Public
 #		License (>=v2). Read the file COPYING that comes with GRASS
@@ -96,11 +96,13 @@
    fi
 fi
 
-if [ -n "$GIS_OPT_MASKCATS" -a "$GIS_FLAG_R" -eq 0 ]; then
-   eval `r.info -t $GIS_OPT_INPUT`
-   if [ "$datatype" != "CELL" ] ; then
-      g.message -e "Raster map <$GIS_OPT_INPUT> must be integer for maskcats parameter"
-      exit 1
+if [ "$GIS_FLAG_R" -eq 0 ] ; then
+   if [ -n "$GIS_OPT_MASKCATS" -a "$GIS_OPT_MASKCATS" != '*' ] ; then
+      eval `r.info -t $GIS_OPT_INPUT`
+      if [ "$datatype" != "CELL" ] ; then
+         g.message -e "Raster map <$GIS_OPT_INPUT> must be integer for maskcats parameter"
+         exit 1
+      fi
    fi
 fi