[GRASS-SVN] r66359 - grass/branches/releasebranch_7_0/scripts/v.unpack

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-09-27 16:06:39 -0700 (Sun, 27 Sep 2015)
New Revision: 66359

Modified:
   grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py
Log:
v.unpack: fix unpacking when name of archive and the packed map differ (merge from trunk, r66021)

Modified: grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py	2015-09-27 22:57:43 UTC (rev 66358)
+++ grass/branches/releasebranch_7_0/scripts/v.unpack/v.unpack.py	2015-09-27 23:06:39 UTC (rev 66359)
@@ -97,11 +97,11 @@
 
     # extract data
     tar.extractall()
-    if os.path.exists(os.path.join(map_name, 'coor')):
+    if os.path.exists(os.path.join(data_name, 'coor')):
         pass
-    elif os.path.exists(os.path.join(map_name, 'cell')):
+    elif os.path.exists(os.path.join(data_name, 'cell')):
         grass.fatal(_("This GRASS GIS pack file contains raster data. Use "
-                      "r.unpack to unpack <%s>" % map_name))
+                      "v.unpack to unpack <%s>" % map_name))
     else:
         grass.fatal(_("Pack file unreadable"))