Skip to content

Remove requirement that gpg is not a symlink #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove requirement that gpg is not a symlink #259

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pretty_bad_protocol/_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,7 @@ def _deprefix(line, prefix, callback=None):
def _find_binary(binary=None):
"""Find the absolute path to the GnuPG binary.

Also run checks that the binary is not a symlink, and check that
our process real uid has exec permissions.
Also check that our process real uid has exec permissions.

:param str binary: The path to the GnuPG binary.
:raises: :exc:`~exceptions.RuntimeError` if it appears that GnuPG is not
Expand All @@ -421,7 +420,7 @@ def _find_binary(binary=None):
elif os.access(binary, os.X_OK):
found = binary
if found is None:
try: found = _which('gpg', abspath_only=True, disallow_symlinks=True)[0]
try: found = _which('gpg', abspath_only=True)[0]
except IndexError as ie:
log.error("Could not find binary for 'gpg'.")
try: found = _which('gpg2')[0]
Expand Down