diff options
| author | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-01-28 13:39:11 +0100 |
|---|---|---|
| committer | Folker Bernitt <fbernitt@thoughtworks.com> | 2015-01-28 13:39:11 +0100 |
| commit | c49aa556e3ea0f152478f455ab2859d30acede7d (patch) | |
| tree | 5d617fe2780eeb125a4f0fb02d6fe7ec20309167 /service/pixelated/config | |
| parent | 607f8abaf33c273b06f1ddebadbf08da996b1d26 (diff) | |
(Re-)added leap home parameter to soledad initialization.
- Problem introduced with commit 26b85d8e52
- Issues #237 #232 #196
Diffstat (limited to 'service/pixelated/config')
| -rw-r--r-- | service/pixelated/config/__init__.py | 2 | ||||
| -rw-r--r-- | service/pixelated/config/soledad.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/service/pixelated/config/__init__.py b/service/pixelated/config/__init__.py index 53c49e16..e2de0186 100644 --- a/service/pixelated/config/__init__.py +++ b/service/pixelated/config/__init__.py @@ -59,7 +59,7 @@ def initialize(): loading_app = loading(args) def init_soledad(): - return init_soledad_and_user_key(app) + return init_soledad_and_user_key(app, args.home) def stop_loading_app(leap_session): d = loading_app.stopListening() diff --git a/service/pixelated/config/soledad.py b/service/pixelated/config/soledad.py index 3a033f09..13a6dbd4 100644 --- a/service/pixelated/config/soledad.py +++ b/service/pixelated/config/soledad.py @@ -17,10 +17,11 @@ from pixelated.bitmask_libraries.session import open as open_leap_session -def init_soledad_and_user_key(app): +def init_soledad_and_user_key(app, leap_home): leap_session = open_leap_session(app['LEAP_USERNAME'], app['LEAP_PASSWORD'], - app['LEAP_SERVER_NAME']) + app['LEAP_SERVER_NAME'], + leap_home) soledad = leap_session.soledad_session.soledad soledad.sync(defer_decryption=False) leap_session.nicknym.generate_openpgp_key() |