Parcourir la source

verbose confirmation; fix Verify (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38791 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman il y a 15 ans
Parent
commit
f8bf59af74
2 fichiers modifiés avec 5 ajouts et 1 suppressions
  1. 4 0
      db/db.select/main.c
  2. 1 1
      gui/wxpython/gui_modules/sqlbuilder.py

+ 4 - 0
db/db.select/main.c

@@ -84,6 +84,9 @@ int main(int argc, char **argv)
 	}
     }
 
+    if(parms.test_only)
+	G_verbose_message(_("Test %s."), stat ? _("failed") : _("succeeded"));
+
     db_close_database(driver);
     db_shutdown_driver(driver);
 
@@ -257,6 +260,7 @@ static void parse_command_line(int argc, char **argv)
 	parms.h = 1;
     else
 	parms.h = 0;
+
     parms.test_only = flag_test->answer;
 
     if (!parms.fs)

+ 1 - 1
gui/wxpython/gui_modules/sqlbuilder.py

@@ -320,7 +320,7 @@ class SQLFrame(wx.Frame):
                 pass
     def OnVerify(self,event):
         if self.text_sql.GetValue():
-            if os.system("""!db.select -t driver=%s database="%s" sql="SELECT * FROM %s WHERE %s" """ % \
+            if os.system("""db.select -t --verbose driver=%s database="%s" sql="SELECT * FROM %s WHERE %s" """ % \
                     (self.driver, self.database,self.tablename,
                         self.text_sql.GetValue().strip().replace("\n"," "))):
                 # FIXME: LOG