[GRASS-SVN] r69461 - in grass/branches/releasebranch_7_0: gui/wxpython/modules scripts/g.extension

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-09-12 06:42:27 -0700 (Mon, 12 Sep 2016)
New Revision: 69461

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/modules/extensions.py
   grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
Log:
wxGUI/g.extension: fix extension loading and installing after adding new temporal modules (merge from trunk, r69455, r69459)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/modules/extensions.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/modules/extensions.py	2016-09-12 13:31:30 UTC (rev 69460)
+++ grass/branches/releasebranch_7_0/gui/wxpython/modules/extensions.py	2016-09-12 13:42:27 UTC (rev 69461)
@@ -267,7 +267,7 @@
         for prefix in ('display', 'database',
                        'general', 'imagery',
                        'misc', 'postscript', 'paint',
-                       'raster', 'raster3D', 'sites', 'vector', 'wxGUI', 'other'):
+                       'raster', 'raster3D', 'sites', 'temporal', 'vector', 'wxGUI', 'other'):
             node = self.model.AppendNode(parent=self.model.root, label=prefix)
             self.mainNodes[prefix] = node
         
@@ -291,6 +291,7 @@
                  'r'  : 'raster',
                  'r3' : 'raster3D',
                  's'  : 'sites',
+                 't'  : 'temporal',
                  'v'  : 'vector',
                  'wx' : 'wxGUI',
                  ''   : 'other' }

Modified: grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2016-09-12 13:31:30 UTC (rev 69460)
+++ grass/branches/releasebranch_7_0/scripts/g.extension/g.extension.py	2016-09-12 13:42:27 UTC (rev 69461)
@@ -164,6 +164,7 @@
              'r'   : 'raster',
              'r3'  : 'raster3d',
              's'   : 'sites',
+             't'   : 'temporal',
              'v'   : 'vector',
              'wx'  : 'gui/wxpython'
              }
@@ -348,7 +349,7 @@
         grass.warning(_("Flag 'g' ignored, addons metadata file not available"))
 
     prefix = ['d', 'db', 'g', 'i', 'm', 'ps',
-              'p', 'r', 'r3', 's', 'v']
+              'p', 'r', 'r3', 's', 't', 'v']
     for d in prefix:
         modclass = expand_module_class_name(d)
         grass.verbose(_("Checking for '%s' modules...") % modclass)