[GRASS-SVN] r36633 - grass/trunk/raster/r.proj

[svn_grass at osgeo.org]

Author: mlennert
Date: 2009-04-08 10:50:40 -0400 (Wed, 08 Apr 2009)
New Revision: 36633

Modified:
   grass/trunk/raster/r.proj/main.c
Log:
allow for identical location names in different databases


Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c	2009-04-08 14:42:08 UTC (rev 36632)
+++ grass/trunk/raster/r.proj/main.c	2009-04-08 14:50:40 UTC (rev 36633)
@@ -219,8 +219,9 @@
 
     setname = imapset->answer ? imapset->answer : G_store(G_mapset());
 
-    if (strcmp(inlocation->answer, G_location()) == 0)
-	G_fatal_error(_("You have to use a different location for input than the current"));
+    if (strcmp(inlocation->answer, G_location()) == 0 &&
+        (!indbase->answer || strcmp(indbase->answer, G_gisdbase()) == 0))
+	G_fatal_error(_("Input and output locations can not be the same"));
 
     G_get_window(&outcellhd);