[GRASS-SVN] r69934 - grass/branches/releasebranch_7_0/scripts/r.in.aster

[svn_grass at osgeo.org]

Author: mlennert
Date: 2016-11-27 23:30:35 -0800 (Sun, 27 Nov 2016)
New Revision: 69934

Modified:
   grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.py
Log:
r.in.aster: r.in.aster: pass output prefix to import function (fixes #3097, merge from trunk r69859)


Modified: grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.py	2016-11-28 07:29:22 UTC (rev 69933)
+++ grass/branches/releasebranch_7_0/scripts/r.in.aster/r.in.aster.py	2016-11-28 07:30:35 UTC (rev 69934)
@@ -126,12 +126,12 @@
             if band in allbands:
                 dataset = bands[proctype][band]
                 srcfile = "HDF4_EOS:EOS_SWATH:%s:%s" % (input, dataset)
-                import_aster(proj, srcfile, tempfile, band)
+                import_aster(proj, srcfile, tempfile, output, band)
             else:
                 grass.fatal(_('band %s is not an available Terra/ASTER band') % band)
     elif proctype == "DEM": 
         srcfile = input
-        import_aster(proj, srcfile, tempfile, "DEM")
+        import_aster(proj, srcfile, tempfile, output, "DEM")
 
     #cleanup
     grass.message(_("Cleaning up ..."))
@@ -140,7 +140,7 @@
 
     return
 
-def import_aster(proj, srcfile, tempfile, band):
+def import_aster(proj, srcfile, tempfile, output, band):
     #run gdalwarp with selected options (must be in $PATH)
     #to translate aster image to geotiff
     grass.message(_("Georeferencing aster image ..."))