v.import (#119)

change back to original location + mapset on cleanup (see r.import f4cab7c)

scripts/v.import/v.import.py

@@ -107,10 +107,13 @@ from grass.exceptions import CalledModuleError
 # initialize global vars
 TMPLOC = None
 SRCGISRC = None
+TGTGISRC = None
 GISDBASE = None
 
 
 def cleanup():
+    if TGTGISRC:
+        os.environ['GISRC'] = str(TGTGISRC)
     # remove temp location
     if TMPLOC:
         grass.try_rmdir(os.path.join(GISDBASE, TMPLOC))
@@ -119,7 +122,7 @@ def cleanup():
 
 
 def main():
-    global TMPLOC, SRCGISRC, GISDBASE
+    global TMPLOC, SRCGISRC, TGTGISRC, GISDBASE
     overwrite = grass.overwrite()
 
     # list formats and exit
@@ -188,7 +191,7 @@ def main():
 
     tgtmapset = grassenv['MAPSET']
     GISDBASE = grassenv['GISDBASE']
-    tgtgisrc = os.environ['GISRC']
+    TGTGISRC = os.environ['GISRC']
     SRCGISRC = grass.tempfile()
 
     TMPLOC = 'temp_import_location_' + str(os.getpid())
@@ -228,7 +231,7 @@ def main():
 
     if options['extent'] == 'region':
         # switch to target location
-        os.environ['GISRC'] = str(tgtgisrc)
+        os.environ['GISRC'] = str(TGTGISRC)
 
         # v.in.region in tgt
         vreg = 'vreg_' + str(os.getpid())
@@ -260,7 +263,7 @@ def main():
         output = grass.list_grouped('vector')['PERMANENT'][0]
 
     # switch to target location
-    os.environ['GISRC'] = str(tgtgisrc)
+    os.environ['GISRC'] = str(TGTGISRC)
 
     # check if map exists
     if not grass.overwrite() and \