Commit 8e66a6c8 by James Cammarata

Cleaning up the import testing around setuptools

parent 6879415f
...@@ -8,15 +8,10 @@ sys.path.insert(0, os.path.abspath('lib')) ...@@ -8,15 +8,10 @@ sys.path.insert(0, os.path.abspath('lib'))
from ansible import __version__, __author__ from ansible import __version__, __author__
try: try:
from setuptools import setup from setuptools import setup
raise ImportError
except ImportError: except ImportError:
print(''' print "Ansible now needs setuptools in order to build. " + \
ansible now needs setuptools in order to build. "Install it using your package manager (usually python-setuptools) or via pip (pip install setuptools)."
sys.exit(1)
Some scripts now need setuptools installed in order to run.
''')
raise
# find library modules # find library modules
from ansible.constants import DEFAULT_MODULE_PATH from ansible.constants import DEFAULT_MODULE_PATH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment