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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 2ad24947560a599805ce3ad55f5e560bb3d173a5
Author: Sandro Tosi <morph at debian.org>
Date:   Thu Apr 22 19:33:58 2010 +0200

    only take file name and md5sum from Conffile from dpkg --status; thanks to all the reporters; Closes: #577986
    
    dpkg --status now also report an optional third value for Conffiles, 'obsolete':
    
    $ dpkg --status xfonts-mathml
    ...
    Conffiles:
     /etc/X11/fonts/Type1/xfonts-mathml.scale 3928791fa92cf3bd6597c3fe224379c6
     /etc/defoma/hints/xfonts-mathml.hints a5984e4966b881253e223e327acddfb4 obsolete
    ...
    
    Given how the parse was done, the third param is still recognized and passed to
    code that expects only 2 values, when there are in fact 3.
    
    With this patch, only the first 2 values are taken.

diff --git a/debian/changelog b/debian/changelog
index 708160a..53aaa09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reportbug (4.12+fixes) UNRELEASED; urgency=low
+
+  * reportbug/utils.py
+    - only take file name and md5sum from Conffile from dpkg --status; thanks to
+      all the reporters; Closes: #577986
+
+ -- Sandro Tosi <morph at debian.org>  Thu, 22 Apr 2010 19:30:32 +0200
+
 reportbug (4.12) unstable; urgency=low
 
   * reportbug/debianbts.py
diff --git a/reportbug/utils.py b/reportbug/utils.py
index ce7d82d..74fa42b 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -342,7 +342,7 @@ def get_package_status(package, avail=False):
             if line[:2] != ' /':
                 confmode = False
             else:
-                conffiles = conffiles + [tuple(line.split())]
+                conffiles = conffiles + [tuple(line.split()[:2])]
 
         if versionre.match(line):
             (crud, pkgversion) = line.split(": ", 1)

-- 
Reportbug - reports bugs in the Debian distribution