[GRASS-SVN] r49564 - grass/branches/releasebranch_6_4/scripts/r.reclass.area

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-06 07:53:50 -0800 (Tue, 06 Dec 2011)
New Revision: 49564

Modified:
   grass/branches/releasebranch_6_4/scripts/r.reclass.area/r.reclass.area
Log:
r.reclass.area: copy color table from input
               fix g.message call
	       (merge r49561 from devbr6)


Modified: grass/branches/releasebranch_6_4/scripts/r.reclass.area/r.reclass.area
===================================================================
--- grass/branches/releasebranch_6_4/scripts/r.reclass.area/r.reclass.area	2011-12-06 15:50:55 UTC (rev 49563)
+++ grass/branches/releasebranch_6_4/scripts/r.reclass.area/r.reclass.area	2011-12-06 15:53:50 UTC (rev 49564)
@@ -84,12 +84,16 @@
  exit 1
 fi
 
-if [ -z "$GIS_OPT_GREATER" -a -z "$GIS_OPT_LESSER" ] || \
-    [ -n "$GIS_OPT_GREATER" -a -n "$GIS_OPT_LESSER" ]; then
+if [ -z "$GIS_OPT_GREATER" -a -z "$GIS_OPT_LESSER" ] ; then
   g.message -e message="You have to specify either lesser= or greater="
   exit 1
 fi
 
+if [ -n "$GIS_OPT_GREATER" -a -n "$GIS_OPT_LESSER" ] ; then
+  g.message -e message="lesser= and greater= are mutually exclusive"
+  exit 1
+fi
+
 if [ -n "$GIS_OPT_LESSER" ] ; then
   op=0
   limit="$GIS_OPT_LESSER"