From: cgalvan <cgalvan@mail.utexas.edu>
Date: Sat, 17 Jan 2009 01:00:47 +0000 (-0700)
Subject: run build_tahoe command with trial commmand
X-Git-Tag: allmydata-tahoe-1.3.0~183
X-Git-Url: https://git.rkrishnan.org/class-simplejson.JSONDecoder-index.html?a=commitdiff_plain;h=791cfca8d5456065daa965190b44cd8801ff8271;p=tahoe-lafs%2Ftahoe-lafs.git

run build_tahoe command with trial commmand
---

diff --git a/setup.py b/setup.py
index 6bb651c5..8fdc3e2e 100644
--- a/setup.py
+++ b/setup.py
@@ -164,6 +164,11 @@ if 'trial' in sys.argv[1:]:
             sys.argv.append("--reactor=poll")
     setup_requires.append('setuptools_trial >= 0.2')
 
+    # Whenever we run the 'trial' command, make sure that the build_tahoe step
+    # is run as well to pass through the --multi-version flag.
+    trial_index = sys.argv.index('trial')
+    sys.argv.insert(trial_index, 'build_tahoe')
+
 # setuptools_darcs is required to produce complete distributions (such as with
 # "sdist" or "bdist_egg"), unless there is a PKG-INFO file present which shows
 # that this is itself a source distribution.