diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2017-03-14 19:44:49 +0100 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2017-03-15 19:05:34 +0100 |
| commit | 86c9ae95e847d8025214427585ffee0d7fb553a8 (patch) | |
| tree | 6780e0689a7bfe8dee371cfa54d87952ea8bdcee /src/leap | |
| parent | 72350b78a14dc5fd8d63b41b86a2394e9e898b15 (diff) | |
[tests] let's include OSX CI
Diffstat (limited to 'src/leap')
| -rw-r--r-- | src/leap/bitmask/util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/bitmask/util.py b/src/leap/bitmask/util.py index 59551285..3a7bacd2 100644 --- a/src/leap/bitmask/util.py +++ b/src/leap/bitmask/util.py @@ -67,7 +67,8 @@ def get_gpg_bin_path(): os.path.join(here(), "..", "apps", "mail", "gpg")) else: try: - gpgbin_options = which("gpg", path_extension='/usr/bin/') + path_ext = '/usr/bin/:/usr/local/opt/gnupg/bin/' + gpgbin_options = which("gpg", path_extension=path_ext) # 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. @@ -89,7 +90,8 @@ def get_gpg_bin_path(): # binary, in case it was renamed using dpkg-divert or manually. # We could just pick gpg2, but we need to solve #7564 first. try: - gpgbin_options = which("gpg1", path_extension='/usr/bin') + path_ext = '/usr/bin/:/usr/local/opt/gnupg/bin/' + gpgbin_options = which("gpg1", path_extension=path_ext) for opt in gpgbin_options: if not os.path.islink(opt): gpgbin = opt |