From 0eb166615b3710be6af9ac15c8ad4f11ca8f73cc Mon Sep 17 00:00:00 2001
From: Michiel Nauta <m.d.nauta@hetnet.nl>
Date: Fri, 11 Feb 2011 18:29:15 +0000
Subject: [PATCH] Replace bare except by specific exception.

svn: r16606
---
 src/gen/db/write.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gen/db/write.py b/src/gen/db/write.py
index ed57cfd23..6b367cb57 100644
--- a/src/gen/db/write.py
+++ b/src/gen/db/write.py
@@ -1378,13 +1378,16 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
                                      person.get_primary_name().serialize()))
         try:
             cursor = self.surnames.cursor(txn=self.txn)
-            cursor.set(name)
-            if cursor.count() == 1:
+            cursor_position = cursor.set(name)
+            if cursor_position is not None and cursor.count() == 1:
                 i = bisect.bisect(self.surname_list, name)
                 if 0 <= i-1 < len(self.surname_list):
                     del self.surname_list[i-1]
-        except:
-            pass
+        except db.DBError, err:
+            if str(err) == "(0, 'DB object has been closed')":
+                pass # A batch transaction closes the surnames db table.
+            else:
+                raise
         finally:
             if 'cursor' in locals():
                 cursor.close()