From 8e66a6c811ecf8ed5993bb5b7ca12bc0a92671aa Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Tue, 29 Apr 2014 14:53:44 -0500 Subject: [PATCH] Cleaning up the import testing around setuptools --- setup.py | 11 +++-------- 1 file 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