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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit c7a4a318b6d99101eff880495ebc04cc1c871da9
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Jun 6 21:41:38 2012 +0200

    initial support for multi-arch: keep arch-qualifier and remove it just before preparing the report body; Closes: #666469
    
    We just strip the arch qualifier before generating the template, while for the
    package lookup, we split on the ': ' sequence since now we have:
    
      <pkg>[:<arch>]: <description>
    
    so splitting on ':' is not enough anymore.

diff --git a/bin/reportbug b/bin/reportbug
index 95757b0..fd919ee 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -2068,7 +2068,7 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
                     pass
         else:
             message = utils.generate_blank_report(
-                submitas or package, pkgversion, severity, justification,
+                (submitas or package).split(':')[0], 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 c90eac5..58e2a0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,8 +36,11 @@ reportbug (6.3.2) UNRELEASED; urgency=low
   * bin/reportbug, man/reportbug.*
     - fix several typos; thanks to Simon Kainz for the report and patch;
       Closes: #669249
+  * bin/reportbug, reportbug/utils.py
+    - initial support for multi-arch: keep arch-qualifier and remove it just
+      before preparing the report body; Closes: #666469
 
- -- Sandro Tosi <morph at debian.org>  Sun, 03 Jun 2012 18:35:50 +0200
+ -- Sandro Tosi <morph at debian.org>  Wed, 06 Jun 2012 21:40:07 +0200
 
 reportbug (6.3.1) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index acccb56..1d72ca4 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -180,7 +180,7 @@ def query_dpkg_for(filename, use_dlocate=True):
         # Ignore diversions
         if 'diversion by' in line: continue
 
-        (package, path) = line.split(':', 1)
+        (package, path) = line.split(': ', 1)
         path = path.strip()
         packlist = package.split(', ')
         for package in packlist:

-- 
Reportbug - reports bugs in the Debian distribution