Bladeren bron

pythonlib: fix db_connection(True) when default DB connection is not defined

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67524 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 jaren geleden
bovenliggende
commit
60a094b7cc
1 gewijzigde bestanden met toevoegingen van 7 en 3 verwijderingen
  1. 7 3
      lib/python/script/db.py

+ 7 - 3
lib/python/script/db.py

@@ -104,9 +104,13 @@ def db_connection(force=False):
 
     :return: parsed output of db.connect
     """
-    nuldev = file(os.devnull, 'w')
-    conn = parse_command('db.connect', flags='g', stderr=nuldev)
-    nuldev.close()
+    try:
+        nuldev = file(os.devnull, 'w')
+        conn = parse_command('db.connect', flags='g', stderr=nuldev)
+        nuldev.close()
+    except CalledModuleError:
+        conn = None
+    
     if not conn and force:
         run_command('db.connect', flags='c')
         conn = parse_command('db.connect', flags='g')