Merge lp:~raoul-snyman/openlp/bug-1154467-2.0 into lp:openlp/2.0

[Raoul Snyman]

Attempt to fix bug #1154467 by waiting 10ms and retrying the commit

[Tim Bentley (trb143)]

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

Will that help when we try twice in a row? Shouldn't we wait some ms? Sure we must not add this to other places where the few ms will sum up to many seconds.....

review: Needs Information

[Raoul Snyman (raoul-snyman)]

I haven't been able to reproduce it, so I wasn't able to see if I actually fixed it. I figured we could at least get this out there and see if it improves the situation.

[Phill (phill-ridout)]

I cannot reproduce this issue either. But hopefully this will reduce / solve this issue

review: Approve

[Andreas Preikschat (googol-deactivatedaccount)]

review: Approve

=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py	2013-12-21 23:26:36 +0000
+++ openlp/plugins/bibles/lib/db.py	2013-12-28 22:21:49 +0000
@@ -32,9 +32,11 @@
 import os
 import re
 import sqlite3
+import time
 
 from PyQt4 import QtCore
 from sqlalchemy import Column, ForeignKey, or_, Table, types, func
+from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import class_mapper, mapper, relation
 from sqlalchemy.orm.exc import UnmappedClassError
 
@@ -48,6 +50,7 @@
 
 RESERVED_CHARACTERS = u'\\.^$*+?{}[]()'
 
+
 class BibleMeta(BaseModel):
     """
     Bible Meta Data
@@ -257,7 +260,12 @@
                 text=verse_text
             )
             self.session.add(verse)
-        self.session.commit()
+        try:
+            self.session.commit()
+        except OperationalError:
+            # Wait 10ms and try again.
+            time.sleep(0.01)
+            self.session.commit()
 
     def create_verse(self, book_id, chapter, verse, text):
         """
@@ -363,7 +371,7 @@
 
         ``book``
             The name of the book, according to the selected language.
-        
+
         ``language_selection``
             The language selection the user has chosen in the settings
             section of the Bible.