[GRASS-SVN] r42999 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-08-04 12:12:17 +0000 (Wed, 04 Aug 2010)
New Revision: 42999

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
Log:
wxGUI: create new vector map - don't fail if vector map already exists
(merge r42998 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2010-08-04 12:10:41 UTC (rev 42998)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2010-08-04 12:12:17 UTC (rev 42999)
@@ -254,10 +254,10 @@
                           message=_("Unable to create vector map <%s>.") % outmap,
                           caption=_("Error"),
                           style=wx.ID_OK | wx.ICON_ERROR | wx.CENTRE)
-            return False
+            return (None, None)
         
         if outmap == '': # should not happen
-            return False
+            return (None, None)
         
         cmd[1][cmd[2]] = outmap
         
@@ -278,7 +278,7 @@
                 overwrite = True
             else:
                 dlgOw.Destroy()
-                return False
+                return (None, None)
 
         if UserSettings.Get(group='cmd', key='overwrite', subkey='enabled') is True:
             overwrite = True
@@ -290,7 +290,7 @@
         except gcmd.GException, e:
             gcmd.GError(parent = self,
                         message = e)
-            return None
+            return (None, None)
         
         #
         # create attribute table
@@ -306,7 +306,7 @@
                             quiet = True,
                             parent = parent,
                             stdin = sql)
-
+            
             gcmd.RunCommand('v.db.connect',
                             quiet = True,
                             parent = parent,