From e5542af5c6599bcb020726b5879b194e8a67a782 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Tue, 5 Apr 2005 15:31:04 +0000
Subject: [PATCH] * src/DbPrompter.py: provide a better error message of DB
 open failure * src/const.py.in: Add Martin Hawlisch and Richard Tayor to
 author list

svn: r4300
---
 gramps2/AUTHORS           |  4 ++++
 gramps2/ChangeLog         |  4 ++++
 gramps2/src/DbPrompter.py | 10 ++++++++--
 gramps2/src/const.py.in   |  2 ++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/gramps2/AUTHORS b/gramps2/AUTHORS
index 5bf801260..cddcbf384 100644
--- a/gramps2/AUTHORS
+++ b/gramps2/AUTHORS
@@ -8,4 +8,8 @@ Alex Roitman ** BookReport, command line, Gramps manual, bugfixes
 
 Tim Waugh ** Comprehensive Ancestor report, docgen, Makefiles, bugfixes
 
+Martin Hawlisch - Filters
+
+Richard Taylor - ScratchPad.py, GrampsDBCallback.py
+
 $Id$
diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 3c351a3bf..6acab2519 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-05  Don Allingham  <don@gramps-project.org>
+	* src/DbPrompter.py: provide a better error message of DB open failure
+	* src/const.py.in: Add Martin Hawlisch and Richard Tayor to author list
+
 2005-04-05  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/PedView.py: Show Baptism/Burial as fallback for birth/death; Moved text
 	generation for details view out of DispBox class so that PedigreeView can use the
diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py
index 83ee9e97c..6c9f9621d 100644
--- a/gramps2/src/DbPrompter.py
+++ b/gramps2/src/DbPrompter.py
@@ -62,6 +62,8 @@ import WriteGrdb
 import WriteXML
 import WriteGedcom
 
+from bsddb import db
+
 #-------------------------------------------------------------------------
 #
 # Constants
@@ -194,9 +196,13 @@ class ExistingDbPrompter:
             try:
                 if open_native(self.parent,filename,filetype):
                     return True
-            except:
+            except db.DBInvalidArgError, msg:
                 QuestionDialog.ErrorDialog(
-                    _("Could not open file: %s") % filename)
+                    _("Could not open file: %s") % filename, msg[1])
+                return False
+            except:
+                import DisplayTrace
+                DisplayTrace.DisplayTrace()
                 return False
 
             # The above native formats did not work, so we need to 
diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in
index d03de6510..006a9e92d 100644
--- a/gramps2/src/const.py.in
+++ b/gramps2/src/const.py.in
@@ -144,6 +144,8 @@ comments     = _("GRAMPS (Genealogical Research and Analysis "
 authors      = [
     "Donald N. Allingham",
     "Alexander Roitman",
+    "Richard Taylor",
+    "Martin Hawlisch",
     "Tim Waugh",
     "Donald A. Peterson", 
     "David Hampton",