From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 10 Jan 2008 21:02:13 +0000 (-0700)
Subject: setup: require setuptools >= v0.6c6 on all platforms
X-Git-Url: https://git.rkrishnan.org/listings/pb2server.py?a=commitdiff_plain;h=e07f9c27c294d703833e81537cea11bfcaa8dadf;p=tahoe-lafs%2Ftahoe-lafs.git

setup: require setuptools >= v0.6c6 on all platforms
Technically, we could get away with v0.6c5 or v0.6c4 on non-cygwin platforms, but if someone currently doesn't have setuptools >= v0.6c6 installed then our setup process will just use our bundled setuptools v0.6c7 anyway, so it will still work, and this makes the setup.py and the accompanying documentation simpler.
---

diff --git a/setup.py b/setup.py
index 10709dbf..2ca9c88c 100644
--- a/setup.py
+++ b/setup.py
@@ -17,13 +17,11 @@ try:
 except ImportError:
     pass
 else:
-    if 'cygwin' in sys.platform.lower():
-        min_version='0.6c6'
-    else:
-        # foolscap uses a module-level os.urandom() during import, which
-        # breaks inside older setuptools' sandboxing. 0.6c4 is the first
-        # version which fixed this problem.
-        min_version='0.6c4'
+    # foolscap uses a module-level os.urandom() during import, which breaks
+    # inside older setuptools' sandboxing. 0.6c4 is the first version which
+    # fixed this problem.  On cygwin there was a different problem -- a
+    # permissions error -- that was fixed in 0.6c6.
+    min_version='0.6c6'
     download_base = "file:"+os.path.join('misc', 'dependencies')+os.path.sep
     use_setuptools(min_version=min_version,
                    download_base=download_base,