summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-04-29 14:53:44 -0500
committerJames Cammarata <jimi@sngx.net>2014-04-29 14:53:44 -0500
commit8e66a6c811ecf8ed5993bb5b7ca12bc0a92671aa (patch)
tree3e30fd154800bba9f74236a856b8229c0d1533ef /setup.py
parent6879415f252f7bb1931934befd6fc6690e1b6424 (diff)
downloadansible-8e66a6c811ecf8ed5993bb5b7ca12bc0a92671aa.tar.gz
Cleaning up the import testing around setuptools
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/setup.py b/setup.py
index 166f754ac5..61e650696b 100644
--- a/setup.py
+++ b/setup.py
@@ -8,15 +8,10 @@ sys.path.insert(0, os.path.abspath('lib'))
from ansible import __version__, __author__
try:
from setuptools import setup
- raise ImportError
except ImportError:
- print('''
-ansible now needs setuptools in order to build.
-
-Some scripts now need setuptools installed in order to run.
- ''')
- raise
-
+ print "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)
# find library modules
from ansible.constants import DEFAULT_MODULE_PATH