Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silently accept "not found" errors when deleting database files

Browse Source 
svn: r13215
This commit is contained in:
Gerald Britton
2009-09-16 20:31:28 +00:00
parent 86ef57b04e
commit 311d9b16b9
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gen/db/write.py
View File

@@ -655,7 +655,10 @@ class GrampsDBDir(GrampsDbRead, Callback, UpdateCallback):
for (database, name) in items:
database.close()
_db = db.DB(self.env)
_db.remove(_mkname(self.full_name, name), name)
try:
_db.remove(_mkname(self.full_name, name), name)
except db.DBNoSuchFileError:
pass
if callback:
callback(index)
index += 1
@@ -887,7 +890,10 @@ class GrampsDBDir(GrampsDbRead, Callback, UpdateCallback):
for index, (dbmap, dbname) in enumerate(db_maps):
getattr(self, dbmap).close()
_db = db.DB(self.env)
_db.remove(_mkname(self.full_name, dbname), dbname)
try:
_db.remove(_mkname(self.full_name, dbname), dbname)
except db.DBNoSuchFileError:
pass
callback(index+1)
# Open reference_map and primary map
@@ -1574,11 +1580,17 @@ class GrampsDBDir(GrampsDbRead, Callback, UpdateCallback):
# Disconnect unneeded secondary indices
self.surnames.close()
_db = db.DB(self.env)
_db.remove(_mkname(self.full_name, SURNAMES), SURNAMES)
try:
_db.remove(_mkname(self.full_name, SURNAMES), SURNAMES)
except db.DBNoSuchFileError:
pass
self.reference_map_referenced_map.close()
_db = db.DB(self.env)
_db.remove(_mkname(self.full_name, REF_REF), REF_REF)
try:
_db.remove(_mkname(self.full_name, REF_REF), REF_REF)
except db.DBNoSuchFileError:
pass
return transaction
@catch_db_error