[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 6.0-86-g832fecc

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 92773503ffbdd0c0ea07d62ffffa5e6da50980f2
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Dec 4 14:23:39 2011 +0100

    don't blindly set (even empty) bugscript headers/pseudos, that will prevent spurious blank lines in bug pseudoheaders section; thanks to Andreas Beckmann and Jonathan Nieder for the report; Closes: #649956 #650723

diff --git a/bin/reportbug b/bin/reportbug
index 74f6121..ae9321e 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -2037,8 +2037,11 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                     'Exit without filing a report.', False, nowrap=True):
                     efail("Package bug script failed; stopping.\n")
 
-            headers.extend(bugscript_hdrs.split('\n'))
-            pseudos.append(bugscript_pseudo.strip())
+            # add bugscript headers only if present
+            if bugscript_hdrs:
+                headers.extend(bugscript_hdrs.split('\n'))
+            if bugscript_pseudo:
+                pseudos.append(bugscript_pseudo.strip())
             addinfo = None
             if not self.options.noconf:
                 addinfo = u"\n-- Package-specific info:\n"+text
diff --git a/debian/changelog b/debian/changelog
index 7d46001..e569365 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+reportbug (6.3.1) UNRELEASED; urgency=low
+
+  * bin/reportbug
+    - don't blindly set (even empty) bugscript headers/pseudos, that will
+      prevent spurious blank lines in bug pseudoheaders section; thanks to
+      Andreas Beckmann and Jonathan Nieder for the report; Closes: #649956
+      #650723
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 04 Dec 2011 14:18:01 +0100
+
 reportbug (6.3) unstable; urgency=low
 
   * reportbug/utils.py

-- 
Reportbug - reports bugs in the Debian distribution