From fbadcfd44fb86752abd19616cb56acb25b89cae4 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Tue, 16 Dec 2014 09:20:11 -0800
Subject: [PATCH] Fix for not all platforms having optional libraries at the
 proper versions.

---
 bin/ansible          | 11 +++++++++++
 bin/ansible-playbook | 10 +++++++++-
 bin/ansible-vault    | 10 +++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/bin/ansible b/bin/ansible
index b82a18d3d3e..7ba615dbc0a 100755
--- a/bin/ansible
+++ b/bin/ansible
@@ -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
 
diff --git a/bin/ansible-playbook b/bin/ansible-playbook
index 93645903f79..d25a3710d87 100755
--- a/bin/ansible-playbook
+++ b/bin/ansible-playbook
@@ -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
diff --git a/bin/ansible-vault b/bin/ansible-vault
index 3079b31d9ed..22cfc0e1487 100755
--- a/bin/ansible-vault
+++ b/bin/ansible-vault
@@ -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