diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-14 16:59:42 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-10-14 16:59:42 -0300 |
| commit | e015e7565936ed0cc9032732ab551a3d51db5e86 (patch) | |
| tree | 61af3fbd67e25923af7d92e47e2fdfa361d04763 /src/leap/bitmask/services/soledad | |
| parent | 228f0c41f088eb15fd3125894adaad4868c74ddd (diff) | |
| parent | 1a7cf76fbcfe3098838fbcdc5467c6f8b1cda691 (diff) | |
Merge remote-tracking branch 'chiiph/bug/various_windows_fixes' into develop
Diffstat (limited to 'src/leap/bitmask/services/soledad')
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 409389be..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 @@ -319,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") |