diff options
author | Kali Kaneko <kali@leap.se> | 2013-10-30 16:33:41 -0200 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2013-10-30 16:33:41 -0200 |
commit | 8766b396cb7faf84c6eab3b2516229c791fe2e90 (patch) | |
tree | 7fae4c8ae7119d58c98ecc8c13b6ad3d2a009a77 /src/leap/bitmask/services/soledad/soledadbootstrapper.py | |
parent | f22b1a04f892857d162d87f9c9e120e7c5daadf7 (diff) | |
parent | a06b5719f028e619a4b3800fb346ed3c984e4d25 (diff) |
Merge tag '0.3.5' into debian
Tag leap.bitmask version 0.3.5
Conflicts:
.gitignore
pkg/requirements.pip
Diffstat (limited to 'src/leap/bitmask/services/soledad/soledadbootstrapper.py')
-rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 7968dd6a..4619ba80 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -34,6 +34,7 @@ from leap.bitmask.services.abstractbootstrapper import AbstractBootstrapper from leap.bitmask.services.soledad.soledadconfig import SoledadConfig from leap.bitmask.util import is_file, is_empty_file from leap.bitmask.util import get_path_prefix +from leap.bitmask.platform_init import IS_WIN from leap.common.check import leap_assert, leap_assert_type, leap_check from leap.common.files import which from leap.keymanager import KeyManager, openpgp @@ -264,6 +265,10 @@ class SoledadBootstrapper(AbstractBootstrapper): logger.error("Error while initializing soledad " "(unauthorized).") self.soledad_failed.emit() + except u1db_errors.HTTPError as exc: + logger.exception("Error whie initializing soledad " + "(HTTPError)") + self.soledad_failed.emit() except Exception as exc: logger.exception("Unhandled error while initializating " "soledad: %r" % (exc,)) @@ -315,11 +320,12 @@ class SoledadBootstrapper(AbstractBootstrapper): :returns: the gpg binary path :rtype: str """ - # TODO: Fix for Windows gpgbin = None if flags.STANDALONE: gpgbin = os.path.join( get_path_prefix(), "..", "apps", "mail", "gpg") + if IS_WIN: + gpgbin += ".exe" else: try: gpgbin_options = which("gpg") |