Browse Source

db.droptable bug fixes

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54778 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 12 years ago
parent
commit
89dbdc4f06
1 changed files with 4 additions and 4 deletions
  1. 4 4
      scripts/db.droptable/db.droptable.py

+ 4 - 4
scripts/db.droptable/db.droptable.py

@@ -60,7 +60,7 @@ def main():
     else:
     else:
         database = kv['database']
         database = kv['database']
     if options['driver']:
     if options['driver']:
-        driver = kv['driver']
+        driver = options['driver']
     else:
     else:
         driver = kv['driver']
         driver = kv['driver']
     # schema needed for PG?
     # schema needed for PG?
@@ -70,7 +70,7 @@ def main():
     
     
     # check if table exists
     # check if table exists
     nuldev = file(os.devnull, 'w')
     nuldev = file(os.devnull, 'w')
-    if not grass.db_table_exist(table, stdout = nuldev, stderr = nuldev):
+    if not grass.db_table_exist(table):
 	grass.fatal(_("Table <%s> not found in database <%s>") % \
 	grass.fatal(_("Table <%s> not found in database <%s>") % \
                         (table, database))
                         (table, database))
     
     
@@ -84,10 +84,10 @@ def main():
 	    if f['table'] == table:
 	    if f['table'] == table:
 		used.append(vect)
 		used.append(vect)
 		break
 		break
-    if used:
+    if len(used) > 0:
 	grass.warning(_("Deleting table <%s> which is attached to following map(s):") % table)
 	grass.warning(_("Deleting table <%s> which is attached to following map(s):") % table)
 	for vect in used:
 	for vect in used:
-	    grass.message(vect)
+	    grass.warning("%s" % vect)
     
     
     if not force:
     if not force:
 	grass.message(_("The table <%s> would be deleted.") % table)
 	grass.message(_("The table <%s> would be deleted.") % table)