[GRASS-SVN] r62615 - in grass/branches/releasebranch_7_0: . gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-11-05 05:58:06 -0800 (Wed, 05 Nov 2014)
New Revision: 62615

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
Log:
wxGUI: call vector_db only with valid parameters; fixed previously ignored error coming from vnet initialization after run_command API change #2326 (merge from trunk, r62614)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606,62609
   + /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62597,62603,62606,62609,62614

Modified: grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-11-05 13:55:00 UTC (rev 62614)
+++ grass/branches/releasebranch_7_0/gui/wxpython/gui_core/gselect.py	2014-11-05 13:58:06 UTC (rev 62615)
@@ -722,6 +722,9 @@
 
     def _CheckDBConnection(self):
         """!Check DB connection"""
+        # if map is not defined (happens with vnet initialization)
+        if not self.map:
+            return False
         nuldev = file(os.devnull, 'w+')
         self.layers = grass.vector_db(map = self.map, stderr = nuldev)
         nuldev.close()