[cig-commits] r4621 - cs/Exchanger/trunk

[leif at geodynamics.org]

Author: leif
Date: 2006-09-25 17:39:50 -0700 (Mon, 25 Sep 2006)
New Revision: 4621

Modified:
   cs/Exchanger/trunk/setup.py
Log:
Fixed a glitch in 'setup.py':  install 'setuptools' itself.


Modified: cs/Exchanger/trunk/setup.py
===================================================================
--- cs/Exchanger/trunk/setup.py	2006-09-26 00:23:40 UTC (rev 4620)
+++ cs/Exchanger/trunk/setup.py	2006-09-26 00:39:50 UTC (rev 4621)
@@ -6,14 +6,22 @@
 from ez_setup import use_setuptools
 use_setuptools()
 
-from setuptools import setup
+import setuptools
 import sys
 
-setup(
+requirements = []
+
+if setuptools.bootstrap_install_from:
+    requirements.append(setuptools.bootstrap_install_from)
+    setuptools.bootstrap_install_from = None
+
+requirements.append('pythia >= 0.8-1.0dev-r4617, < 0.8-2.0a, == dev')
+
+setuptools.setup(
     script_args = (
     ['easy_install',
      '--find-links=svn://geodynamics.org/cig/cs/pythia/trunk#egg=pythia-dev'] +
     sys.argv[1:] +
-    ['pythia >= 0.8-1.0dev-r4617, < 0.8-2.0a, == dev']
+    requirements
     )
 )