From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 19 Jan 2009 21:53:52 +0000 (-0700)
Subject: setup: undo (for the second time) the use of the --multi-version feature
X-Git-Tag: allmydata-tahoe-1.3.0~177
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/reliability?a=commitdiff_plain;h=8148366d93c34dbebc943aeb1705fc5649cb6268;p=tahoe-lafs%2Ftahoe-lafs.git

setup: undo (for the second time) the use of the --multi-version feature
When this feature is turned on, then setuptools doesn't create easy-install.pth, setuptools.pth, or site.py in the target site-packages dir.  I don't know why not and we should probably open a ticket on the setuptools tracker and/or hack setuptools to create those files anyway.  But for now (for the Tahoe-1.3.0 release), we're going to leave --multi-version mode off and require users to manually uninstall any packages which are too old and thus conflict with our newer dependencies.
---

diff --git a/setup.py b/setup.py
index 8fdc3e2e..4c194301 100644
--- a/setup.py
+++ b/setup.py
@@ -165,7 +165,7 @@ if 'trial' in sys.argv[1:]:
     setup_requires.append('setuptools_trial >= 0.2')
 
     # Whenever we run the 'trial' command, make sure that the build_tahoe step
-    # is run as well to pass through the --multi-version flag.
+    # is run as well.
     trial_index = sys.argv.index('trial')
     sys.argv.insert(trial_index, 'build_tahoe')
 
@@ -297,7 +297,7 @@ class BuildTahoe(Command):
                 f.write(line)
             f.close()
 
-        command = [sys.executable, "setup.py", "develop", "--multi-version",
+        command = [sys.executable, "setup.py", "develop",
             "--prefix=support"]
         print "Command:", " ".join(command)
         rc = subprocess.call(command)