diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/backend/components.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index d44a2f35..654f17c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ bitmask (0.6.1.1) unstable; urgency=medium * Cherry-pick fix for missing openvpn.pem not being re-downloaded - * Cherry-pick fix for bad soledad imports -- Ben Carrillo <ben@futeisha.org> Tue, 19 Aug 2014 10:01:49 -0500 diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index 89f3c5a6..03fcf0cb 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -60,7 +60,7 @@ from leap.common import certs as leap_certs from leap.keymanager import openpgp from leap.keymanager.errors import KeyAddressMismatch, KeyFingerprintMismatch -from leap.soledad.client.secrets import NoStorageSecret, PassphraseTooShort +from leap.soledad.client import NoStorageSecret, PassphraseTooShort logger = logging.getLogger(__name__) diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 745645f3..c4e43bfe 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -45,8 +45,7 @@ from leap.common.files import which from leap.keymanager import KeyManager, openpgp from leap.keymanager.errors import KeyNotFound from leap.soledad.common.errors import InvalidAuthTokenError -from leap.soledad.client import Soledad -from leap.soledad.client.secrets import BootstrapSequenceError +from leap.soledad.client import Soledad, BootstrapSequenceError logger = logging.getLogger(__name__) |