summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/next-changelog.rst2
-rw-r--r--src/leap/bitmask/services/soledad/soledadbootstrapper.py13
2 files changed, 8 insertions, 7 deletions
diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
index f6f38011..73e13ae5 100644
--- a/changes/next-changelog.rst
+++ b/changes/next-changelog.rst
@@ -10,13 +10,13 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
Features
~~~~~~~~
-- `#7563 <https://leap.se/code/issues/7563>`_: support the use of gnupg2
- `#7542 <https://leap.se/code/issues/7542>`_: Pin mail.bitmask.net provider. Closes feature #7542.
- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
- New feature without related issue number.
Bugfixes
~~~~~~~~
+- `#7563 <https://leap.se/code/issues/7563>`_: try to look for /usr/bin/gpg1
- `#7562 <https://leap.se/code/issues/7562>`_: use zmq embedded minitornado, instead of system lib.
- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
- Bugfix without related issue number.
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):