From 259b57badde3ea7571a8b63f8c483ae9add7c7d2 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Sat, 13 Aug 2011 12:41:21 +0200 Subject: [PATCH] added try/except --- openlp/plugins/bibles/forms/bibleupgradeform.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index e0ebc46fc..d78124c6c 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -703,7 +703,12 @@ class BibleUpgradeForm(OpenLPWizard): # Delete upgraded (but not complete, corrupted, ...) bible. delete_file(os.path.join(self.path, filename[0])) # Copy not upgraded bible back. - shutil.move(os.path.join(temp_dir, filename[0]), self.path) + try: + shutil.move(os.path.join(temp_dir, filename[0]), self.path) + except shutil.Error: + # We can ignore any error, because the temp directory is + # will be deleted later. + pass if self.checkBox[number].checkState() == QtCore.Qt.Checked: failed_import += 1 if failed_import > 0: @@ -728,6 +733,6 @@ class BibleUpgradeForm(OpenLPWizard): else: self.progressLabel.setText(translate( 'BiblesPlugin.UpgradeWizardForm', 'Upgrade failed.')) - # Remove old bibles. + # Remove temp directory. shutil.rmtree(temp_dir, True) OpenLPWizard.postWizard(self)