Updated script generators to show a nice warning if setuptools/distribute can't be found during execution.

3 files changed, 27 insertions, 3 deletions

diff --git a/contrib/build-installer b/contrib/build-installer
index 4739fe3a4..8a0e1af26 100755
--- a/contrib/build-installer
+++ b/contrib/build-installer
@@ -7,9 +7,21 @@ from packager import generate_script
 here = os.path.dirname(os.path.abspath(__file__))
 file_name = os.path.join(here, 'get-pip.py')
 
+entry = """
+import sys
+try:
+    import setuptools
+    import pkg_resources
+except ImportError:
+    raise SystemExit("An error occured while trying to run %s. Make sure "
+                     "you have setuptools or distribute installed." % __file__)
+import pip
+pip.bootstrap()
+"""
+
 def main():
     sys.stdout.write("Creating pip bootstrapper...")
-    script = generate_script('import pip; pip.bootstrap()', ['pip'])
+    script = generate_script(entry, ['pip'])
     f = open(file_name, 'w')
     try:
         f.write(script)
diff --git a/contrib/build-standalone b/contrib/build-standalone
index 5b918b6a6..b2a1aebe1 100755
--- a/contrib/build-standalone
+++ b/contrib/build-standalone
@@ -7,9 +7,21 @@ from packager import generate_script
 here = os.path.dirname(os.path.abspath(__file__))
 file_name = os.path.join(here, 'run-pip.py')
 
+entry = """
+import sys
+try:
+    import setuptools
+    import pkg_resources
+except ImportError:
+    raise SystemExit("An error occured while trying to run %s. Make sure "
+                     "you have setuptools or distribute installed." % __file__)
+import pip
+pip.main()
+"""
+
 def main():
     sys.stdout.write("Creating standalone pip...")
-    script = generate_script('import pip; pip.main()', ['pip'])
+    script = generate_script(entry, ['pip'])
     f = open(file_name, 'w')
     try:
         f.write(script)
diff --git a/contrib/packager/template.py b/contrib/packager/template.py
index 3a7a75088..c7f6fdc76 100644
--- a/contrib/packager/template.py
+++ b/contrib/packager/template.py
@@ -40,7 +40,7 @@ if __name__ == "__main__":
         temp_dir = unpack(sources)
         sys.path.insert(0, temp_dir)
 
-        entry = "@ENTRY@"
+        entry = """@ENTRY@"""
         do_exec(entry, locals())
     finally:
         shutil.rmtree(temp_dir)