Browse Source

Small fixes when create a new directory

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57559 15284696-431f-4ddb-bdfa-cd5b030d7da7
Pietro Zambelli 11 years ago
parent
commit
13a051725a
1 changed files with 10 additions and 4 deletions
  1. 10 4
      lib/python/pygrass/modules/grid/grid.py

+ 10 - 4
lib/python/pygrass/modules/grid/grid.py

@@ -53,8 +53,8 @@ def copy_mapset(mapset, path):
     per_new = os.path.join(path, 'PERMANENT')
     map_old = mapset.path()
     map_new = os.path.join(path, mapset.name)
-    if not os.path.isdir(path):
-        os.makedirs(path)
+    if not os.path.isdir(per_new):
+        os.makedirs(per_new)
     if not os.path.isdir(map_new):
         os.mkdir(map_new)
     for f in (fi for fi in os.listdir(per_old) if fi.isupper()):
@@ -100,6 +100,7 @@ def copy_raster(rasters, src, dst, region=None):
         dst.current()
         rupck(input=file_dst, output=rast, overwrite=True)
         os.remove(file_dst)
+    return gisrc_src, gisrc_dst
 
 
 def get_cmd(cmdd):
@@ -201,10 +202,15 @@ class GridModule(object):
         self.start_col = start_col
         self.out_prefix = out_prefix
         self.n_mset = None
+        self.gisrc_src = self.gisrc_dst = None
         if move:
             self.n_mset = copy_mapset(self.mset, move)
-            copy_raster(select(self.module.inputs, 'raster'),
-                        self.mset, self.n_mset, region=self.region)
+            rasters = select(self.module.inputs, 'raster')
+            self.gisrc_src, self.gisrc_dst = copy_raster(rasters,
+                                                         self.mset,
+                                                         self.n_mset,
+                                                         region=self.region)
+
         self.bboxes = split_region_tiles(region=region,
                                          width=width, height=height,
                                          overlap=overlap)