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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit f57b69ffe3f92ced5fd2b5cd25d1171d1c4b319a
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jul 29 11:10:07 2012 +0200

    remove arch qualifier (for m-a) only if we're not reporting against the source package; thanks to Vincent Lefevre for the report; Closes: #681157

diff --git a/bin/reportbug b/bin/reportbug
index c25cf9b..ca0b501 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -2067,8 +2067,13 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                 except IOError:
                     pass
         else:
+            p = submitas or package
+            # multiarch: remove arch qualifier only if we're not reporting
+            # against the src package
+            if not p.startswith('src:'):
+                p = p.split(':')[0]
             message = utils.generate_blank_report(
-                (submitas or package).split(':')[0], pkgversion, severity, justification,
+                p, pkgversion, severity, justification,
                 depinfo, conftext, foundfile, incfiles, bts, exinfo, rtype,
                 klass, subject, tags, body, mode, pseudos, debsumsoutput,
                 issource=issource)
diff --git a/debian/changelog b/debian/changelog
index 6115434..6985d18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reportbug (6.4.1) UNRELEASED; urgency=low
+
+  * bin/reportbug
+    - remove arch qualifier (for m-a) only if we're not reporting against the
+      source package; thanks to Vincent Lefevre for the report; Closes: #681157
+
+ -- Sandro Tosi <morph at debian.org>  Sun, 29 Jul 2012 11:08:10 +0200
+
 reportbug (6.4) unstable; urgency=low
 
   * reportbug/checkversions.py

-- 
Reportbug - reports bugs in the Debian distribution