cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix for not all platforms having optional libraries at the proper versions.

Browse source
This commit is contained in:
Toshio Kuratomi 2014-12-16 09:20:11 -08:00
parent 27d2539fcd
commit fbadcfd44f
3 changed files with 29 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bin/ansible
View file

@ -19,6 +19,17 @@
########################################################
__requires__ = ['ansible']
try:
import pkg_resources
except Exception:
# Use pkg_resources to find the correct versions of libraries and set
# sys.path appropriately when there are multiversion installs. But we
# have code that better expresses the errors in the places where the code
# is actually used (the deps are optional for many code paths) so we don't
# want to fail here.
pass
import os
import sys

10
bin/ansible-playbook
View file

@ -19,7 +19,15 @@
#######################################################
__requires__ = ['ansible']
import pkg_resources
try:
import pkg_resources
except Exception:
# Use pkg_resources to find the correct versions of libraries and set
# sys.path appropriately when there are multiversion installs. But we
# have code that better expresses the errors in the places where the code
# is actually used (the deps are optional for many code paths) so we don't
# want to fail here.
pass
import sys
import os

10
bin/ansible-vault
View file

@ -19,7 +19,15 @@
# http://docs.ansible.com/playbooks_vault.html for more details.
__requires__ = ['ansible']
import pkg_resources
try:
import pkg_resources
except Exception:
# Use pkg_resources to find the correct versions of libraries and set
# sys.path appropriately when there are multiversion installs. But we
# have code that better expresses the errors in the places where the code
# is actually used (the deps are optional for many code paths) so we don't
# want to fail here.
pass
import os
import sys