[GRASS-SVN] r47161 - grass/trunk/scripts/g.extension

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-07-18 10:19:56 -0700 (Mon, 18 Jul 2011)
New Revision: 47161

Modified:
   grass/trunk/scripts/g.extension/g.extension.py
Log:
g.extension: call tempdir() after parser()


Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py	2011-07-18 16:45:45 UTC (rev 47160)
+++ grass/trunk/scripts/g.extension/g.extension.py	2011-07-18 17:19:56 UTC (rev 47161)
@@ -96,12 +96,11 @@
 
 # temp dir
 remove_tmpdir = True
-tmpdir = grass.tempdir()
 
 def check():
     for prog in ('svn', 'make', 'install', 'gcc'):
         if not grass.find_program(prog, ['--help']):
-            grass.fatal(_("%s required. Please install '%s' first.") % (prog, prog))
+            grass.fatal(_("'%s' required. Please install '%s' first.") % (prog, prog))
     
 def expand_module_class_name(c):
     name = { 'd'   : 'display',
@@ -283,7 +282,6 @@
     return ret
 
 def cleanup():
-    global tmpdir, remove_tmpdir
     if remove_tmpdir:
         grass.try_rmdir(tmpdir)
     else:
@@ -309,7 +307,7 @@
             grass.fatal(_("Installation of wxGUI extension requires -%s flag.") % 's')
         
     grass.message(_("Fetching '%s' from GRASS-Addons SVN (be patient)...") % options['extension'])
-    global tmpdir
+    
     os.chdir(tmpdir)
     if grass.verbosity() == 0:
         outdev = open(os.devnull, 'w')
@@ -465,5 +463,7 @@
 
 if __name__ == "__main__":
     options, flags = grass.parser()
+    global tmpdir
+    tmpdir = grass.tempdir()
     atexit.register(cleanup)
     sys.exit(main())