From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 7 Oct 2014 18:28:53 +0000 (+0100)
Subject: Specify the setuptools egg filename explicitly rather than globbing for it.
X-Git-Tag: allmydata-tahoe-1.10.1a1~117
X-Git-Url: https://git.rkrishnan.org/frontends/webapi.txt?a=commitdiff_plain;h=3ff7f9bea3e56833a36657bfbeba3bbc42c3f95a;p=tahoe-lafs%2Ftahoe-lafs.git

Specify the setuptools egg filename explicitly rather than globbing for it.
(Note that if the version changes in future, this will fail loudly so we'll know we have to change it.)

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

diff --git a/setup.py b/setup.py
index 11b24614..4b3ad977 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ import sys; assert sys.version_info < (3,), ur"Tahoe-LAFS does not run under Pyt
 #
 # See the docs/about.rst file for licensing information.
 
-import glob, os, stat, subprocess, re
+import os, stat, subprocess, re
 
 ##### sys.path management
 
@@ -70,7 +70,7 @@ if len(sys.argv) > 1 and sys.argv[1] == '--fakedependency':
 
 __requires__ = install_requires[:]
 
-egg = os.path.realpath(glob.glob('setuptools-*.egg')[0])
+egg = os.path.realpath('setuptools-0.6c16dev5.egg')
 sys.path.insert(0, egg)
 import setuptools; setuptools.bootstrap_install_from = egg