From: david-sarah <david-sarah@jacaranda.org>
Date: Fri, 5 Nov 2010 22:54:15 +0000 (-0800)
Subject: setup.py: fix a bug in the check for whether we are running 'trial' or 'test', that... 
X-Git-Url: https://git.rkrishnan.org/frontends/module-simplejson.html?a=commitdiff_plain;h=306ec02c1d2946b21cd437bf3a7897651268e7ad;p=tahoe-lafs%2Ftahoe-lafs.git

setup.py: fix a bug in the check for whether we are running 'trial' or 'test', that affected zooko's test for #1233. refs #1233
---

diff --git a/setup.py b/setup.py
index 4b1ef205..d352a1a4 100644
--- a/setup.py
+++ b/setup.py
@@ -63,7 +63,7 @@ adglobals = {}
 execfile('src/allmydata/_auto_deps.py', adglobals)
 install_requires = adglobals['install_requires']
 
-if len(sys.argv) > 1 and sys.argv[1] in ['trial', 'test'] and version is not None:
+if ('trial' in sys.argv or 'test' in sys.argv) and version is not None:
     __requires__ = [APPNAME + '==' + version] + install_requires
 
 egg = os.path.realpath(glob.glob('setuptools-*.egg')[0])