From: Zooko O'Whielacronx Date: Thu, 29 Jan 2009 05:55:34 +0000 (-0700) Subject: setup: if any of "build", "develop", or "test" appear in the sys.argv then that means... X-Git-Tag: allmydata-tahoe-1.3.0~128 X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/FOOURL?a=commitdiff_plain;h=d3b78d86cadb8fcd27fbc7449d8d504cba945633;p=tahoe-lafs%2Ftahoe-lafs.git setup: if any of "build", "develop", or "test" appear in the sys.argv then that means we'll be doing a develop, so add the workarounds for setuptools #17 in any case I think there must be a much better solution for this -- probably to fix setuptools #17 and ship our own fork of setuptools and rely on it. --- diff --git a/setup.py b/setup.py index fa2320fe..7f10422b 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ for i in range(len(sys.argv)): pp.append(libdir) os.environ['PYTHONPATH'] = os.pathsep.join(pp) - if arg.startswith("develop"): + 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])])