mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-03-21 19:25:16 +00:00
setup: fix bin/tahoe to include .egg's from the source tree root dir as well
This is necessary, as we can't prevent setuptools from respecting any such eggs, therefore we need to respect them in order to maintain consistency. However, we don't normally install any "install_requires" eggs into the source tree root dir.
This commit is contained in:
parent
70be8d6a8a
commit
97f2953cec
@ -30,6 +30,13 @@ if len(where) >= 2 and where[-2] == "bin":
|
||||
if fn.endswith(".egg"):
|
||||
support_eggs.append(os.path.join(supportdir, fn))
|
||||
|
||||
# We also need to include .egg's in the base dir, because if there is an
|
||||
# .egg there then "make build-deps" will take that as satisfying its
|
||||
# requirements.
|
||||
for fn in os.listdir(base):
|
||||
if fn.endswith(".egg"):
|
||||
support_eggs.append(os.path.abspath(os.path.join(base, fn)))
|
||||
|
||||
sys.path.extend(support_eggs)
|
||||
|
||||
# also update PYTHONPATH so that child processes (like twistd) will
|
||||
|
@ -14,10 +14,4 @@ if os.path.exists(support_lib):
|
||||
if fn.endswith(".egg"):
|
||||
path.append(os.path.abspath(os.path.join(support_lib, fn)))
|
||||
|
||||
# We also need to include .egg's in the CWD, because those are placed there by
|
||||
# libraries that we've installed if *they* require them.
|
||||
for fn in os.listdir("."):
|
||||
if fn.endswith(".egg"):
|
||||
path.append(os.path.abspath(os.path.join(os.getcwd(), fn)))
|
||||
|
||||
print os.pathsep.join(path)
|
||||
|
Loading…
x
Reference in New Issue
Block a user