summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-08-19 09:55:23 -0300
committerdrebs <drebs@leap.se>2013-08-19 09:55:23 -0300
commit5c525fb850639326e14d183bcd273e5e73d3dfe7 (patch)
treeaffac02af742d60eda600f5b9dade3bd0ecd0bd8
parent2f72be8de2bf049f4e3185f6c0724a24ae4552cc (diff)
Update to new soledad package scheme.
-rw-r--r--changes/feature_3487-split-soledad-into-common-client-and-server2
-rw-r--r--pkg/requirements.pip2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py2
3 files changed, 4 insertions, 2 deletions
diff --git a/changes/feature_3487-split-soledad-into-common-client-and-server b/changes/feature_3487-split-soledad-into-common-client-and-server
new file mode 100644
index 00000000..46983232
--- /dev/null
+++ b/changes/feature_3487-split-soledad-into-common-client-and-server
@@ -0,0 +1,2 @@
+ o Update to new soledad package scheme (common, client and server). Closes
+ #3487.
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index f533e521..b77bb605 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -18,7 +18,7 @@ qt4reactor
python-gnupg
leap.common>=0.3.0
-leap.soledad>=0.1.0
+leap.soledad.client>=0.3.0
leap.keymanager>=0.2.0
# Remove this when nickserver is online
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 9e150226..a481df4e 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -35,7 +35,7 @@ from leap.common.check import leap_assert, leap_assert_type
from leap.common.files import get_mtime
from leap.keymanager import KeyManager, openpgp
from leap.keymanager.errors import KeyNotFound
-from leap.soledad import Soledad
+from leap.soledad.client import Soledad
logger = logging.getLogger(__name__)