From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 13 Oct 2014 17:47:23 +0000 (+0100)
Subject: bin/tahoe @python should always invoke the same Python that ran bin/tahoe.
X-Git-Tag: allmydata-tahoe-1.10.1a1~111
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=b14f509eeb6b2e1d5486bdb5b0088ecf183c3138;p=tahoe-lafs%2Ftahoe-lafs.git

bin/tahoe @python should always invoke the same Python that ran bin/tahoe.

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

diff --git a/bin/tahoe-script.template b/bin/tahoe-script.template
index 3fb7efed..b088eaf6 100644
--- a/bin/tahoe-script.template
+++ b/bin/tahoe-script.template
@@ -94,6 +94,8 @@ if len(args) >= 1 and args[0].startswith('@'):
         prefix = [sys.executable]
     else:
         prefix = []
+        if runner == "python":
+            runner = sys.executable
 
     def _subst(a):
         if a == '@tahoe': return script