summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/services
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-02-19 14:21:50 -0400
committerKali Kaneko <kali@leap.se>2014-02-19 14:21:50 -0400
commit559eea356de5b2fb630f8da5dff46cb1b73d2cf8 (patch)
tree5bab8ac4fa5ab9fa9118ab05aeed3f45d18d8a9c /src/leap/bitmask/services
parentc4953a1760e518d6c884074286956c4fa6d1099b (diff)
parent388196b372f693b596cf96c6982d5b38ff0d8b56 (diff)
Merge remote-tracking branch 'ivan-github/bug/programming-error-bis' into develop
Diffstat (limited to 'src/leap/bitmask/services')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 797508a7..7aa86a02 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -20,15 +20,16 @@ Soledad bootstrapping
import logging
import os
import socket
-import sqlite3
import sys
from ssl import SSLError
+from sqlite3 import ProgrammingError as sqlite_ProgrammingError
from PySide import QtCore
from u1db import errors as u1db_errors
from twisted.internet import threads
from zope.proxy import sameProxiedObjects
+from pysqlcipher.dbapi2 import ProgrammingError as sqlcipher_ProgrammingError
from leap.bitmask.config import flags
from leap.bitmask.config.providerconfig import ProviderConfig
@@ -440,7 +441,7 @@ class SoledadBootstrapper(AbstractBootstrapper):
except u1db_errors.InvalidGeneration as exc:
logger.error("%r" % (exc,))
raise SoledadSyncError("u1db: InvalidGeneration")
- except sqlite3.ProgrammingError as e:
+ except (sqlite_ProgrammingError, sqlcipher_ProgrammingError) as e:
logger.exception("%r" % (e,))
raise
except Exception as exc: