diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-10-02 21:36:37 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-10-03 11:03:41 -0300 |
| commit | b9b7b244984111ec799675dc90073396481e6173 (patch) | |
| tree | e45ec452a0f43cc7eebde01823521b9eab2c06b6 | |
| parent | d4192fce8317372869005ce2b5c455d10763e058 (diff) | |
Only pick one gnupg bin path which is not a symlink
| -rw-r--r-- | changes/choose_one_gnupg | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/changes/choose_one_gnupg b/changes/choose_one_gnupg new file mode 100644 index 00000000..d759616b --- /dev/null +++ b/changes/choose_one_gnupg @@ -0,0 +1 @@ + o Choose one gnupg binary path that is also not a symlink. Closes #3999.
\ No newline at end of file diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index 6731cc84..7968dd6a 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -321,7 +321,18 @@ class SoledadBootstrapper(AbstractBootstrapper): gpgbin = os.path.join( get_path_prefix(), "..", "apps", "mail", "gpg") else: - gpgbin = which("gpg") + try: + gpgbin_options = which("gpg") + # 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. + for opt in gpgbin_options: + if not os.path.islink(opt): + gpgbin = opt + break + except IndexError as e: + logger.debug("Couldn't find the gpg binary!") + logger.exception(e) leap_check(gpgbin is not None, "Could not find gpg binary") return gpgbin |