Sfoglia il codice sorgente

g.extension: call tempdir() after parser()

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47161 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 anni fa
parent
commit
ca85360558
1 ha cambiato i file con 4 aggiunte e 4 eliminazioni
  1. 4 4
      scripts/g.extension/g.extension.py

+ 4 - 4
scripts/g.extension/g.extension.py

@@ -96,12 +96,11 @@ from grass.script import core as grass
 
 
 # temp dir
 # temp dir
 remove_tmpdir = True
 remove_tmpdir = True
-tmpdir = grass.tempdir()
 
 
 def check():
 def check():
     for prog in ('svn', 'make', 'install', 'gcc'):
     for prog in ('svn', 'make', 'install', 'gcc'):
         if not grass.find_program(prog, ['--help']):
         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):
 def expand_module_class_name(c):
     name = { 'd'   : 'display',
     name = { 'd'   : 'display',
@@ -283,7 +282,6 @@ def get_module_script(f):
     return ret
     return ret
 
 
 def cleanup():
 def cleanup():
-    global tmpdir, remove_tmpdir
     if remove_tmpdir:
     if remove_tmpdir:
         grass.try_rmdir(tmpdir)
         grass.try_rmdir(tmpdir)
     else:
     else:
@@ -309,7 +307,7 @@ def install_extension():
             grass.fatal(_("Installation of wxGUI extension requires -%s flag.") % 's')
             grass.fatal(_("Installation of wxGUI extension requires -%s flag.") % 's')
         
         
     grass.message(_("Fetching '%s' from GRASS-Addons SVN (be patient)...") % options['extension'])
     grass.message(_("Fetching '%s' from GRASS-Addons SVN (be patient)...") % options['extension'])
-    global tmpdir
+    
     os.chdir(tmpdir)
     os.chdir(tmpdir)
     if grass.verbosity() == 0:
     if grass.verbosity() == 0:
         outdev = open(os.devnull, 'w')
         outdev = open(os.devnull, 'w')
@@ -465,5 +463,7 @@ def main():
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     options, flags = grass.parser()
     options, flags = grass.parser()
+    global tmpdir
+    tmpdir = grass.tempdir()
     atexit.register(cleanup)
     atexit.register(cleanup)
     sys.exit(main())
     sys.exit(main())