[GRASS-SVN] r68432 - grass/trunk/lib/imagery

[svn_grass at osgeo.org]

Author: marisn
Date: 2016-05-15 05:31:24 -0700 (Sun, 15 May 2016)
New Revision: 68432

Modified:
   grass/trunk/lib/imagery/sigfile.c
   grass/trunk/lib/imagery/sigsetfile.c
Log:
Revert r68415 as overwrite implementation is wrong and should be performed by parser or modules

Modified: grass/trunk/lib/imagery/sigfile.c
===================================================================
--- grass/trunk/lib/imagery/sigfile.c	2016-05-15 10:53:08 UTC (rev 68431)
+++ grass/trunk/lib/imagery/sigfile.c	2016-05-15 12:31:24 UTC (rev 68432)
@@ -13,8 +13,6 @@
 
 #include <string.h>
 #include <grass/imagery.h>
-#include <grass/gis.h>
-#include <grass/glocale.h>
 
 /*!
    \brief Create signature file
@@ -39,13 +37,6 @@
 
     /* create sigset directory */
     sprintf(element, "%s/subgroup/%s/sig", group_name, subgroup);
-    if (G_getenv_nofatal("OVERWRITE")) {
-	if (G_find_file_misc("group", element, group_name, G_mapset())) {
-	    G_fatal_error(_("Signature file for group '%s', subgroup '%s' exists." 
-	    " To overwrite, use the --overwrite flag"), group_name, subgroup);
-	    return NULL;
-	}
-    }
     G__make_mapset_element_misc("group", element);
 
     sprintf(element, "subgroup/%s/sig/%s", subgroup, name);

Modified: grass/trunk/lib/imagery/sigsetfile.c
===================================================================
--- grass/trunk/lib/imagery/sigsetfile.c	2016-05-15 10:53:08 UTC (rev 68431)
+++ grass/trunk/lib/imagery/sigsetfile.c	2016-05-15 12:31:24 UTC (rev 68432)
@@ -15,7 +15,6 @@
 
 #include <grass/gis.h>
 #include <grass/imagery.h>
-#include <grass/gis.h>
 #include <grass/glocale.h>
 
 /*!
@@ -49,13 +48,6 @@
 
     /* create sigset directory */
     sprintf(element, "%s/subgroup/%s/sigset", group_name, subgroup);
-    if (G_getenv_nofatal("OVERWRITE")) {
-	if (G_find_file_misc("group", element, group_name, G_mapset())) {
-	    G_fatal_error(_("Signature file for group '%s', subgroup '%s' exists." 
-	    " To overwrite, use the --overwrite flag"), group_name, subgroup);
-	    return NULL;
-	}
-    }
     G__make_mapset_element_misc("group", element);
 
     sprintf(element, "subgroup/%s/sigset/%s", subgroup, name);