From: david-sarah <david-sarah@jacaranda.org>
Date: Sun, 24 Jul 2011 16:25:30 +0000 (-0700)
Subject: Correct the information printed by '/usr/bin/tahoe debug --help' on Debian/Ubuntu... 
X-Git-Tag: pre-393~19
X-Git-Url: https://git.rkrishnan.org/listings/pb2client.py?a=commitdiff_plain;h=0dc917af08617a26c0a1d476f23834b5f6a4e91d;p=tahoe-lafs%2Ftahoe-lafs.git

Correct the information printed by '/usr/bin/tahoe debug --help' on Debian/Ubuntu. fixes #1441
---

diff --git a/src/allmydata/scripts/debug.py b/src/allmydata/scripts/debug.py
index a046578b..a943507b 100644
--- a/src/allmydata/scripts/debug.py
+++ b/src/allmydata/scripts/debug.py
@@ -846,7 +846,18 @@ Subcommands:
 
 Please run e.g. 'tahoe debug dump-share --help' for more details on each
 subcommand.
-
+"""
+        # See ticket #1441 for why we print different information when
+        # run via /usr/bin/tahoe. Note that argv[0] is the full path.
+        if sys.argv[0] == '/usr/bin/tahoe':
+	    t += """
+To get branch coverage for the Tahoe test suite (on the installed copy of
+Tahoe), install the 'python-coverage' package and then use:
+
+    python-coverage run --branch /usr/bin/tahoe debug trial
+"""
+        else:
+	    t += """
 Another debugging feature is that bin%stahoe allows executing an arbitrary
 "runner" command (typically an installed Python script, such as 'coverage'),
 with the Tahoe libraries on the PYTHONPATH. The runner command name is