]> git.rkrishnan.org Git - tahoe-lafs/zfec.git/commitdiff
setup: try to install our toothpick of setuptools (0.6c12dev) but if that fails then...
authorzooko <zooko@zooko.com>
Mon, 17 Aug 2009 02:01:51 +0000 (07:31 +0530)
committerzooko <zooko@zooko.com>
Mon, 17 Aug 2009 02:01:51 +0000 (07:31 +0530)
Ignore-this: b84642cefe2ada09ec1fd064614882f3
Hopefully this will fix the problems that setuptools-0.6c9 can't automatically include pyutil more than once if two different requirements require pyutil, but also let the "dpkg-buildpackage" build work with setuptools-0.6c9.  I guess this will work only if that latter build doesn't require pyutil multiple times.

darcs-hash:6980b1a7ec79c85036d9b8b97f72544660df7ef1

zfec/ez_setup.py

index f09fd0fcb407bc6bd1f122cb2ebc318ba2b767de..48565c3ec82e8aea5bdc17bd94879cb54bcec888 100755 (executable)
@@ -75,9 +75,10 @@ def use_setuptools(
             "The required version of setuptools (>=%s) is not available, and\n"
             "can't be installed while this script is running. Please install\n"
             " a more recent version first, using 'easy_install -U setuptools'."
-            "\n\n(Currently using %r)"
+            "\n\n(Currently using %r)\n"
+            "Proceeding to attempt to build with the current version...\n"
             ) % (min_version, e.args[0])
-            sys.exit(2)
+            return
         else:
             del pkg_resources, sys.modules['pkg_resources']    # reload ok
             return do_download()