From: Daira Hopwood <daira@jacaranda.org>
Date: Sat, 2 May 2015 21:32:03 +0000 (+0100)
Subject: Fix scoping bugs. refs #2286
X-Git-Url: https://git.rkrishnan.org/about.html?a=commitdiff_plain;h=fa1aeba5842c0617ec0391b3f0bf50db54d4b808;p=tahoe-lafs%2Ftahoe-lafs.git

Fix scoping bugs. refs #2286

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/setup.py b/setup.py
index ea89195a..190c339c 100644
--- a/setup.py
+++ b/setup.py
@@ -64,6 +64,7 @@ else:
 adglobals = {}
 execfile('src/allmydata/_auto_deps.py', adglobals)
 install_requires = adglobals['install_requires']
+setup_requires = adglobals['setup_requires']
 
 if len(sys.argv) > 1 and sys.argv[1] == '--fakedependency':
     del sys.argv[1]
diff --git a/src/allmydata/_auto_deps.py b/src/allmydata/_auto_deps.py
index 4e5c40bc..ba74b1ae 100644
--- a/src/allmydata/_auto_deps.py
+++ b/src/allmydata/_auto_deps.py
@@ -139,6 +139,8 @@ if not hasattr(sys, 'frozen'):
 # <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2291>
 # <https://tahoe-lafs.org/trac/tahoe-lafs/ticket/2286>
 
+setup_requires = []
+
 _use_old_Twisted_and_Nevow = False
 if sys.platform == "win32":
     try:
@@ -151,14 +153,13 @@ if _use_old_Twisted_and_Nevow:
         "Twisted >= 11.1.0, <= 12.1.0",
         "Nevow >= 0.9.33, <= 0.10",
     ]
-    setup_requires = [req for req in install_requires if req.startswith('Twisted')
-                                                      or req.startswith('zope.interface')]
+    setup_requires += [req for req in install_requires if req.startswith('Twisted')
+                                                       or req.startswith('zope.interface')]
 else:
     install_requires += [
         "Twisted >= 13.0.0",
         "Nevow >= 0.11.1",
     ]
-    setup_requires = []
 
 
 # * pyOpenSSL is required in order for foolscap to provide secure connections.