From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 1 Jan 2008 08:53:31 +0000 (-0700)
Subject: setup: whoops, fix the use of source-tree-root-dir eggs in our Makefile
X-Git-Tag: allmydata-tahoe-0.7.0~54
X-Git-Url: https://git.rkrishnan.org/nxhtml.html?a=commitdiff_plain;h=b41284748546e6a1cc3960aeab36c895f6280152;p=tahoe-lafs%2Ftahoe-lafs.git

setup: whoops, fix the use of source-tree-root-dir eggs in our Makefile
---

diff --git a/misc/find-dep-eggs.py b/misc/find-dep-eggs.py
index 97bfc3d8..6a2fef14 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 if there is an .egg there
+# then "make build-deps" will take that as satisfying its requirements.
+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)