Browse Source

v.db.reconnect.all bugfix

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@55005 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 12 năm trước cách đây
mục cha
commit
18fcd9a601
1 tập tin đã thay đổi với 4 bổ sung2 xóa
  1. 4 2
      scripts/v.db.reconnect.all/v.db.reconnect.all.py

+ 4 - 2
scripts/v.db.reconnect.all/v.db.reconnect.all.py

@@ -156,6 +156,8 @@ def main():
     else:
         new_schema = default_connection['schema']
 
+    if old_database == '':
+    	old_database = None
     old_database_subst = None
     if old_database is not None:
 	old_database_subst = substitute_db(old_database)
@@ -230,10 +232,10 @@ def main():
                                           layer = layer, driver = new_driver, database = new_database,
                                           table = new_schema_table, key = key):
                     grass.warning(_("Unable to connect table <%s> to vector <%s> on layer <%s>") %
-				  (table, vect))
+				  (table, vect, str(layer)))
 
             else:
-		if database != substitute_db(new_database):
+		if database != new_database_subst:
 		    grass.warning(_("Layer <%d> will not be reconnected because "
 				    "database or schema do not match.") % layer)