openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-700859 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #700859 Bible importers do not clean up properly after a failed import
  https://bugs.launchpad.net/bugs/700859

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-700859/+merge/51254

Fixed bug #700859: Bible importers do not clean up properly after a failed import.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-700859/+merge/51254
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-700859 into lp:openlp.

=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py	2011-02-24 05:47:38 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py	2011-02-25 06:19:52 +0000
@@ -739,6 +739,7 @@
                 name=license_version,
                 filename=unicode(self.field(u'openlp1_location').toString())
             )
+        bible_name = importer.name
         if importer.do_import():
             self.manager.save_meta_data(license_version, license_version,
                 license_copyright, license_permissions)
@@ -754,3 +755,4 @@
             self.progressLabel.setText(translate(
                 'BiblesPlugin.ImportWizardForm', 'Your Bible import failed.'))
             delete_database(self.plugin.settingsSection, importer.file)
+            del self.manager.db_cache[bible_name]