From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 20 Jan 2009 19:42:29 +0000 (-0700)
Subject: setup: require darcsver always, and not just when we see the string "darcsver" in... 
X-Git-Tag: allmydata-tahoe-1.3.0~169
X-Git-Url: https://git.rkrishnan.org/zeppelin?a=commitdiff_plain;h=d549aad33984703f85fc6d331014502a519e0932;p=tahoe-lafs%2Ftahoe-lafs.git

setup: require darcsver always, and not just when we see the string "darcsver" in sys.argv, because the new aliases hack means that the string might not appear in sys.argv
---

diff --git a/setup.py b/setup.py
index 4c194301..842e65fd 100644
--- a/setup.py
+++ b/setup.py
@@ -144,12 +144,10 @@ setup_requires = []
 # setuptools to satisfy that requirement before Nevow's setup.py tried to "import twisted".
 setup_requires.extend(['Twisted >= 2.4.0', 'setuptools_trial'])
 
-# darcsver is needed only if you want "./setup.py darcsver" to write a new
-# version stamp in src/allmydata/_version.py, with a version number derived from
-# darcs history.
+# darcsver is needed if you want "./setup.py darcsver" to write a new version stamp in
+# src/allmydata/_version.py, with a version number derived from darcs history.
 # http://pypi.python.org/pypi/darcsver
-if 'darcsver' in sys.argv[1:]:
-    setup_requires.append('darcsver >= 1.1.5')
+setup_requires.append('darcsver >= 1.1.5')
 
 # setuptools_trial is needed only if you want "./setup.py trial" to execute the tests.
 # http://pypi.python.org/pypi/setuptools_trial