Browse Source

r.in.wms: overwrite by default
fix mlist_grouped() args


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49920 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 13 years ago
parent
commit
b0def14f31
1 changed files with 3 additions and 3 deletions
  1. 3 3
      scripts/r.in.wms/gdalwarp.py

+ 3 - 3
scripts/r.in.wms/gdalwarp.py

@@ -218,7 +218,7 @@ class GDALWarp:
         # import it into a temporary map
         grass.info(_('Importing raster map...'))
         if grass.run_command('r.in.gdal',
-                             quiet = True,
+                             quiet = True, overwrite = True,
                              flags = self.gdal_flags,
                              input = warpfile,
                              output = tmpmapname) != 0:
@@ -230,7 +230,7 @@ class GDALWarp:
         pattern = tmpmapname + '*'
         grass.debug('Pattern: %s' % pattern)
         mapset = grass.gisenv()['MAPSET']
-        channel_list = grass.mlist_grouped(type = 'rast', pattern = pattern, mapset = mapset)[mapset]
+        channel_list = grass.mlist_grouped(type = 'rast', pattern = pattern)[mapset]
         grass.debug('Channel list: %s' % ','.join(channel_list))
         
         if len(channel_list) < 2: # test for single band data
@@ -319,7 +319,7 @@ class GDALWarp:
     def nowarp_import(self, file, map):
         """Import raster file into GRASS"""
         if grass.run_command('r.in.gdal',
-                             quiet = True,
+                             quiet = True, overwrite = True,
                              flags = 'o' + self.gdal_flags,
                              input = file,
                              output = map) != 0: