From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 29 Jan 2009 14:00:00 +0000 (-0700)
Subject: setup: temporarily comment-out the horrible kludge to work-around setuptools #17... 
X-Git-Tag: allmydata-tahoe-1.3.0~126
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/css/flags?a=commitdiff_plain;h=42d500f73dbf9edca6b417b3b0f526a3f59a8def;p=tahoe-lafs%2Ftahoe-lafs.git

setup: temporarily comment-out the horrible kludge to work-around setuptools #17, while I figure out how to solve it better
---

diff --git a/setup.py b/setup.py
index 54f566f0..cfcc5fd4 100644
--- a/setup.py
+++ b/setup.py
@@ -31,14 +31,15 @@ for i in range(len(sys.argv)):
         if len(sys.argv) > i+1:
             prefixdirs.append(sys.argv[i+1])
 
-    if arg.startswith("develop") or arg.startswith("build") or arg.startswith("test"): # argh! horrible kludge to workaround setuptools #17
-        if sys.platform == "linux2":
-            # workaround for tahoe #229 / setuptools #17, on debian
-            sys.argv.extend(["--site-dirs", "/var/lib/python-support/python%d.%d" % (sys.version_info[:2])])
-        elif sys.platform == "darwin":
-            # this probably only applies to leopard 10.5, possibly only 10.5.5
-            sd = "/System/Library/Frameworks/Python.framework/Versions/%d.%d/Extras/lib/python" % (sys.version_info[:2])
-            sys.argv.extend(["--site-dirs", sd])
+# The following horrible kludge to workaround setuptools #17 is commented-out, because I can't at this moment figure out how to make sure the horrible kludge gets executed only when it is needed (i.e., only when a "setup.py develop" step is about to happen), and the bad effect of setuptools #17 is "only" that setuptools re-installs extant packages.
+#     if arg.startswith("develop") or arg.startswith("build") or arg.startswith("test"): # argh! horrible kludge to workaround setuptools #17
+#         if sys.platform == "linux2":
+#             # workaround for tahoe #229 / setuptools #17, on debian
+#             sys.argv.extend(["--site-dirs", "/var/lib/python-support/python%d.%d" % (sys.version_info[:2])])
+#         elif sys.platform == "darwin":
+#             # this probably only applies to leopard 10.5, possibly only 10.5.5
+#             sd = "/System/Library/Frameworks/Python.framework/Versions/%d.%d/Extras/lib/python" % (sys.version_info[:2])
+#             sys.argv.extend(["--site-dirs", sd])
 
 if not prefixdirs:
     prefixdirs.append("support")