[GRASS-SVN] r52371 - grass/trunk/scripts/r.pack

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-07-13 09:22:25 -0700 (Fri, 13 Jul 2012)
New Revision: 52371

Modified:
   grass/trunk/scripts/r.pack/r.pack.py
Log:
r.pack: write output to given directory, not current working directory

Modified: grass/trunk/scripts/r.pack/r.pack.py
===================================================================
--- grass/trunk/scripts/r.pack/r.pack.py	2012-07-13 15:51:07 UTC (rev 52370)
+++ grass/trunk/scripts/r.pack/r.pack.py	2012-07-13 16:22:25 UTC (rev 52371)
@@ -40,18 +40,25 @@
 
 def main():
     infile = options['input']
+    mapset = None
+    if '@' in infile:
+        infile, mapset = infile.split('@')
+
     if options['output']:
-        outfile = options['output']
+        outfile_path, outfile_base = os.path.split(options['output'])
     else:
-        outfile = infile + '.pack'
+        outfile_path = os.getcwd()
+        outfile_base = infile + '.pack'
     
+    outfile = os.path.join(outfile_path, outfile_base)
+
     global tmp
     tmp = grass.tempdir()
     tmp_dir = os.path.join(tmp, infile)
     os.mkdir(tmp_dir)
     grass.debug('tmp_dir = %s' % tmp_dir)
     
-    gfile = grass.find_file(name = infile, element = 'cell')
+    gfile = grass.find_file(name = infile, element = 'cell', mapset = mapset)
     if not gfile['name']:
         grass.fatal(_("Raster map <%s> not found") % infile)
     
@@ -92,18 +99,17 @@
     
     # pack it all up
     os.chdir(tmp)
-    tar = tarfile.TarFile.open(name = outfile, mode = 'w:gz')
+    tar = tarfile.TarFile.open(name = outfile_base, mode = 'w:gz')
     tar.add(infile, recursive = True)
     tar.close()
     try:
-        shutil.move(outfile, olddir)
+        shutil.move(outfile_base, outfile)
     except shutil.Error, e:
         grass.fatal(e)
         
     os.chdir(olddir)
     
-    grass.verbose(_("Raster map saved to '%s'" % \
-                        os.path.join(olddir, outfile)))
+    grass.verbose(_("Raster map saved to '%s'" % outfile))
     
 if __name__ == "__main__":
     options, flags = grass.parser()