From 9b8759a25b80de81e60fd8318c4b43f98fefc06e Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Thu, 14 Jun 2007 04:26:46 +0000 Subject: [PATCH] * src/GrampsDbUtils/_Backup.py (__do_export): check for existance before deleting 2007-06-13 Don Allingham svn: r8548 --- ChangeLog | 3 +++ src/DbManager.py | 3 ++- src/GrampsDbUtils/_Backup.py | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97b30f718..4cbe22723 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2007-06-13 Don Allingham + * src/GrampsDbUtils/_Backup.py (__do_export): check for existance before deleting + 2007-06-13 Don Allingham * src/DbManager.py: handle cursor while rebuilding * src/glade/gramps.glade: fix label placement diff --git a/src/DbManager.py b/src/DbManager.py index d9765b374..66a87f74c 100644 --- a/src/DbManager.py +++ b/src/DbManager.py @@ -351,7 +351,8 @@ class DbManager: # delete files that are not backup files or the .txt file for filename in os.listdir(dirname): if os.path.splitext(filename)[1] not in (".gbkp", ".txt"): - os.unlink(os.path.join(dirname,filename)) + fname = os.path.join(dirname,filename) + os.unlink(fname) dbclass = GrampsDb.gramps_db_factory(db_type = "x-directory/normal") db = dbclass(Config.get(Config.TRANSACTIONS)) diff --git a/src/GrampsDbUtils/_Backup.py b/src/GrampsDbUtils/_Backup.py index 035359958..d1478bcba 100644 --- a/src/GrampsDbUtils/_Backup.py +++ b/src/GrampsDbUtils/_Backup.py @@ -90,7 +90,8 @@ def __do_export(database): for (base, tbl) in __build_tbl_map(database): new_name = os.path.join(database.get_save_path(), base + ".gbkp") old_name = new_name + ".new" - os.unlink(new_name) + if os.path.isfile(new_name): + os.unlink(new_name) os.rename(old_name, new_name) def restore(database):