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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 8d86cbe2a192e9b5ac783153c4055d0018083a45
Author: Sandro Tosi <morph at debian.org>
Date:   Tue Nov 1 12:29:56 2011 +0100

    report bug using the "Source" pseudo-header, if we've detected it's a source package (either by using --src cli option or by selecting the source pkg in the menu); thanks to Julian Andres Klode for the report; Closes: #644194

diff --git a/bin/reportbug b/bin/reportbug
index 76c2b0e..a5eddb3 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -2064,7 +2064,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                 submitas or package, pkgversion, severity, justification,
                 depinfo, conftext, foundfile, incfiles, bts, exinfo, rtype,
                 klass, subject, tags, body, mode, pseudos, debsumsoutput,
-                issource=self.options.source)
+                issource=issource)
 
         # Substitute server email address
         if submitto and '@' not in sendto:
diff --git a/debian/changelog b/debian/changelog
index 6d388b1..ed433aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,13 @@ reportbug (6.2.3) UNRELEASED; urgency=low
       Shadura for the report; Closes: #646943
     - fix a crash when willing to submit more information after having seen a
       report; thanks to Viet Nguyen for the report; Closes: #644815
+  * bin/reportbug
+    - report bug using the "Source" pseudo-header, if we've detected it's a
+      source package (either by using --src cli option or by selecting the
+      source pkg in the menu); thanks to Julian Andres Klode for the report;
+      Closes: #644194
 
- -- Sandro Tosi <morph at debian.org>  Mon, 31 Oct 2011 03:45:41 +0100
+ -- Sandro Tosi <morph at debian.org>  Tue, 01 Nov 2011 12:26:01 +0100
 
 reportbug (6.2.2) unstable; urgency=low
 
diff --git a/test/test_utils.py b/test/test_utils.py
index 492dd5e..5719e1a 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -363,6 +363,11 @@ Shell: /bin/sh linked to /bin/bash"""
         self.assertIn('Version: 1.2.3', report)
         self.assertIn('Severity: normal', report)
 
+        report = utils.generate_blank_report('reportbug', '1.2.3', 'normal',
+                                             '', '', '', type='debbugs',
+                                             issource=True)
+        self.assertIn('Source: reportbug', report)
+
         # test with exinfo (represents the bug number if this is a followup):
         # int, string, unconvertible (to int) datatype
         report = utils.generate_blank_report('reportbug', '1.2.3', 'normal',

-- 
Reportbug - reports bugs in the Debian distribution