[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.9-24-g20c16d9

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 20c16d9cb68729dab76292380828ca9a53fee966
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Jan 4 16:49:13 2010 +0100

    clarified the option -o/--output output the full mail dump (headers and body) and how to use to report a new bug; thanks to Alan W. Irwin for the report; Closes: #323483

diff --git a/bin/reportbug b/bin/reportbug
index a3d5525..80e9f8d 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -820,8 +820,8 @@ def main():
     parser.add_option('-z', '--no-compress', dest='nocompress',
                       action='store_true', help='do not strip blank lines '
                       'and comments from config files')
-    parser.add_option('-o', '--output', dest='outfile', help='output the '
-                      'report to the specified file')
+    parser.add_option('-o', '--output', dest='outfile', help='output the report'
+                      ' to the specified file (both mail headers and body)')
     parser.add_option('-O', '--offline', help='disable all external queries',
                       action='store_true')
     parser.add_option('-i', '--include', action='append',
diff --git a/debian/changelog b/debian/changelog
index 12d943d..f7b7a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,8 +54,12 @@ reportbug (4.10~WIP) UNRELEASED; urgency=low
     - MUA handling now done with a OO-style, reworked emacs integration to use
       emacsclient to reuse an existing emacs instance (if any); thanks to Dan
       Jacobson for the report and Håkon Stordahl for the patch; Closes: #367298
+  * bin/reportbug, man/reportbug.1
+    - clarified the option -o/--output output the full mail dump (headers and
+      body) and how to use to report a new bug; thanks to Alan W. Irwin for the
+      report; Closes: #323483
 
- -- Sandro Tosi <morph at debian.org>  Mon, 04 Jan 2010 12:21:36 +0100
+ -- Sandro Tosi <morph at debian.org>  Mon, 04 Jan 2010 16:48:05 +0100
 
 reportbug (4.9) unstable; urgency=low
 
diff --git a/man/reportbug.1 b/man/reportbug.1
index c672fc0..e398262 100644
--- a/man/reportbug.1
+++ b/man/reportbug.1
@@ -276,6 +276,12 @@ and its number is already known.
 .TP
 .B \-o FILE, \-\-output=FILE
 Instead of sending an email, redirect it to the specified filename.
+
+The output file is a full dump of the email message, so it contains
+both headers and mail body. If you want to use it as a template to
+create a new bug report, then you have to remove all the headers (mind
+the \`Subject\` one, though) and start the report at the \'Package\'
+pseudo-header.
 .TP
 .B \-O, \-\-offline
 Disable all external queries.  Currently has the same effect as

-- 
Reportbug - reports bugs in the Debian distribution