setup: fix bin/tahoe to include .egg's from the source tree root dir as well

[tahoe-lafs/tahoe-lafs.git] / bin / tahoe

diff --git a/bin/tahoe b/bin/tahoe
index e18c8a81f60c3f0e047ac34ebd7b9b50cca933ef..20f4879942b483617be9e705552cb73701d1bf3d 100644 (file)
--- 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