From: zooko <zooko@zooko.com>
Date: Mon, 17 Aug 2009 02:01:51 +0000 (+0530)
Subject: setup: try to install our toothpick of setuptools (0.6c12dev) but if that fails then... 
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/flags/%22doc.html/rgr-080307.php?a=commitdiff_plain;h=0cdc39fa2ce9eb1fd520c28c6ad8be6ff8c8b6f1;p=tahoe-lafs%2Fzfec.git

setup: try to install our toothpick of setuptools (0.6c12dev) but if that fails then go ahead with whatever setuptools we've got

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
---

diff --git a/zfec/ez_setup.py b/zfec/ez_setup.py
index f09fd0f..48565c3 100755
--- a/zfec/ez_setup.py
+++ b/zfec/ez_setup.py
@@ -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()