From 97f2953cecbfae20dd4dd80be70cd10dd66ebbb4 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx <zooko@zooko.com> Date: Tue, 1 Jan 2008 01:51:28 -0700 Subject: [PATCH] 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. --- bin/tahoe | 7 +++++++ misc/find-dep-eggs.py | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/tahoe b/bin/tahoe index e18c8a81..20f48799 100644 --- a/bin/tahoe +++ b/bin/tahoe @@ -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 diff --git a/misc/find-dep-eggs.py b/misc/find-dep-eggs.py index f0caf567..97bfc3d8 100644 --- a/misc/find-dep-eggs.py +++ b/misc/find-dep-eggs.py @@ -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) -- 2.45.2