[GRASS-SVN] r64156 - in grass/trunk/scripts: r.reclass.area r3.mapcalculator

[svn_grass at osgeo.org]

Author: wenzeslaus
Date: 2015-01-13 22:06:28 -0800 (Tue, 13 Jan 2015)
New Revision: 64156

Modified:
   grass/trunk/scripts/r.reclass.area/r.reclass.area.py
   grass/trunk/scripts/r3.mapcalculator/r3.mapcalculator
Log:
remove minor differences to r64155 release 70 branch (probably due to improper backports)

Modified: grass/trunk/scripts/r.reclass.area/r.reclass.area.py
===================================================================
--- grass/trunk/scripts/r.reclass.area/r.reclass.area.py	2015-01-14 05:51:21 UTC (rev 64155)
+++ grass/trunk/scripts/r.reclass.area/r.reclass.area.py	2015-01-14 06:06:28 UTC (rev 64156)
@@ -7,7 +7,7 @@
 #               Converted to Python by Glynn Clements
 #               Added rmarea method by Luca Delucchi
 # PURPOSE:      Reclasses a raster map greater or less than user specified area size (in hectares)
-# COPYRIGHT:    (C) 1999,2008 by the GRASS Development Team
+# COPYRIGHT:    (C) 1999,2008,2014 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

Modified: grass/trunk/scripts/r3.mapcalculator/r3.mapcalculator
===================================================================
--- grass/trunk/scripts/r3.mapcalculator/r3.mapcalculator	2015-01-14 05:51:21 UTC (rev 64155)
+++ grass/trunk/scripts/r3.mapcalculator/r3.mapcalculator	2015-01-14 06:06:28 UTC (rev 64156)
@@ -145,8 +145,8 @@
 	g.message -e "Please enter a name for the resulting map and try again."
 	exit 1
 elif [ "$GIS_FLAG_O" = 1 ]; then
-	echo `g.list type=rast | grep -w "$GIS_OPT_OUTFILE" `
-	outtest=`g.list type=rast | grep -w $GIS_OPT_OUTFILE`
+	echo `g.list type=raster | grep -w "$GIS_OPT_OUTFILE" `
+	outtest=`g.list type=raster | grep -w $GIS_OPT_OUTFILE`
 	if [ -n "$outtest" ]; then
 		g.message -e "File $GIS_OPT_OUTFILE exists. Exiting."
 		exit 0