From faf6d52a060c7ba7a0bac2bd2e235cd66064281e Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 25 Apr 2006 02:55:41 +0000 Subject: [PATCH] * src/GrampsDb/_GrampsBSDDB.py: handle data_map during reload of the database svn: r6432 --- gramps2/ChangeLog | 2 ++ gramps2/src/GrampsDb/_GrampsBSDDB.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 06a119c6d..8ef444ebb 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,6 @@ 2006-04-24 Don Allingham + * src/GrampsDb/_GrampsBSDDB.py: handle data_map during + reload of the database * src/DataViews/_FamilyView.py: Config changes * src/ViewManager.py: Config changes * src/GrampsDb/_GrampsDbBase.py: Config changes diff --git a/gramps2/src/GrampsDb/_GrampsBSDDB.py b/gramps2/src/GrampsDb/_GrampsBSDDB.py index 15a7f07a2..0f60a98d5 100644 --- a/gramps2/src/GrampsDb/_GrampsBSDDB.py +++ b/gramps2/src/GrampsDb/_GrampsBSDDB.py @@ -1035,7 +1035,10 @@ class GrampsBSDDB(GrampsDbBase): data = data_map.get(str(handle),txn=self.txn) except: data = None - log.error("Failed to get from handle",exc_info=True) + # under certain circumstances during a database reload, + # data_map can be none. If so, then don't report an error + if data_map: + log.error("Failed to get from handle",exc_info=True) if data: newobj = class_type() newobj.unserialize(data)