Browse Source

allow for identical location names in different databases

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@36633 15284696-431f-4ddb-bdfa-cd5b030d7da7
Moritz Lennert 16 years ago
parent
commit
0cf9d29ec3
1 changed files with 3 additions and 2 deletions
  1. 3 2
      raster/r.proj/main.c

+ 3 - 2
raster/r.proj/main.c

@@ -219,8 +219,9 @@ int main(int argc, char **argv)
 
     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);