From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sat, 22 Dec 2007 18:04:24 +0000 (-0700)
Subject: setup: we also need to include .egg's in the CWD in our search path, because if we... 
X-Git-Tag: allmydata-tahoe-0.7.0~81
X-Git-Url: https://git.rkrishnan.org/nxhtml.html?a=commitdiff_plain;h=7fdcbddbbc1c8279098882fec51be8596aff0aba;p=tahoe-lafs%2Ftahoe-lafs.git

setup: we also need to include .egg's in the CWD in our search path, because if we install a 3rd party library into support/, and *it* installs a library that *it* requires, that one will appear in CWD
It would be nice to figure out a way to force them to all appear in support/ where they belong.
---

diff --git a/misc/find-dep-eggs.py b/misc/find-dep-eggs.py
index 97bfc3d8..ef6071ea 100644
--- a/misc/find-dep-eggs.py
+++ b/misc/find-dep-eggs.py
@@ -14,4 +14,10 @@ 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(support_lib, fn)))
+
 print os.pathsep.join(path)