Skip to content
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

Jump to bottom

Catch DistributionNotFound when pycrypto is absent #15731

Merged
merged 2 commits into from
May 19, 2016
Merged

Catch DistributionNotFound when pycrypto is absent #15731

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e2034
Catch DistributionNotFound when pycrypto is absent
mavit May 4, 2016
5661816
Ignore only `pkg_resources.DistributionNotFound`, not other exceptions.
mavit May 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions lib/ansible/parsing/vault/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
HAS_PBKDF2HMAC = True
except ImportError:
pass
except Exception as e:
if e.__module__ == 'pkg_resources' and e.__class__.__name__ == 'DistributionNotFound':
pass
else:
raise

from ansible.compat.six import PY3
from ansible.utils.unicode import to_unicode, to_bytes
Expand Down