summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-11-03 10:52:59 -0400
committerKali Kaneko <kali@leap.se>2015-11-03 10:52:59 -0400
commit5d4835203875197959810d013d2d411d72db2cd1 (patch)
tree674c5fcb4c4469ab127f236200dc7d94818af727 /src
parente5afffff50a746ebf3df3d8cacaf094e3f6e08c1 (diff)
try to use /usr/bin/gpg1, gpg2 is broken for keygen
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index 7030f419..60a2130b 100644
--- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
@@ -444,20 +444,21 @@ class SoledadBootstrapper(AbstractBootstrapper):
if IS_MAC:
gpgbin = os.path.abspath(
os.path.join(here(), "apps", "mail", "gpg"))
+
+ # During the transition towards gpg2, we can look for /usr/bin/gpg1
+ # binary, in case it was renamed using dpkg-divert or manually.
+ # We could just pick gpg2, but we need to solve #7564 first.
if gpgbin is None:
try:
- gpgbin_options = which("gpg2")
- # gnupg checks that the path to the binary is not a
- # symlink, so we need to filter those and come up with
- # just one option.
+ gpgbin_options = which("gpg1")
for opt in gpgbin_options:
if not os.path.islink(opt):
gpgbin = opt
break
except IndexError as e:
- logger.debug("Couldn't find the gpg2 binary!")
+ logger.debug("Couldn't find the gpg1 binary!")
logger.exception(e)
- leap_check(gpgbin is not None, "Could not find gpg2 binary")
+ leap_check(gpgbin is not None, "Could not find gpg1 binary")
return gpgbin
def _init_keymanager(self, address, token):