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

[Sandro Tosi]

The following commit has been merged in the master branch:
commit bdd476fc373d3e70876034d275fdbd74b1cc5dfb
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Apr 3 19:01:22 2010 +0200

    restore the functionality that includes changed conffile into the bug report, that went broken log ago; thanks to Håkon Stordahl for the report and patch; Closes: #503131

diff --git a/bin/reportbug b/bin/reportbug
index 1477dff..0947bfe 100755
--- a/bin/reportbug
+++ b/bin/reportbug
@@ -1660,14 +1660,14 @@ For more details, please see: http://www.debian.org/devel/wnpp/''')
         if conffiles and not self.options.kudos:
             ewrite("Getting changed configuration files...\n")
             confinfo, changed = utils.get_changed_config_files(
-                conffiles, nocompress)
+                conffiles, self.options.nocompress)
 
             if self.options.noconf and changed:
                 for f in changed:
                     confinfo[f] = 'changed [not included]'
             elif changed and not notatty:
                 while 1:
-                    x = ui.select_self.options(
+                    x = ui.select_options(
                         "*** WARNING: The following configuration files have been "
                         "modified:\n"+ "\n".join(changed)+
                         "\nSend modified configuration files", 'Ynd',
diff --git a/debian/changelog b/debian/changelog
index 761e45b..c074845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,8 +31,12 @@ reportbug (4.12) UNRELEASED; urgency=low
     - encode bug summary lines to avoid crashed when using urwid UI due to
       unparsable UTF8 characters; thanks to Stefan Seide for the report;
       Closes: #552045
+  * bin/reportbug, reportbug/utils.py
+    - restore the functionality that includes changed conffile into the bug
+      report, that went broken log ago; thanks to Håkon Stordahl for the report
+      and patch; Closes: #503131
 
- -- Sandro Tosi <morph at debian.org>  Sat, 03 Apr 2010 16:10:02 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 03 Apr 2010 19:00:08 +0200
 
 reportbug (4.11) unstable; urgency=low
 
diff --git a/reportbug/utils.py b/reportbug/utils.py
index dcb5146..126eb80 100644
--- a/reportbug/utils.py
+++ b/reportbug/utils.py
@@ -299,7 +299,7 @@ def get_package_status(package, avail=False):
     dependsre = re.compile('(Pre-)?Depends: ')
     recsre = re.compile('Recommends: ')
     suggestsre = re.compile('Suggests: ')
-    conffilesre = re.compile('Conffiles: ')
+    conffilesre = re.compile('Conffiles:')
     maintre = re.compile('Maintainer: ')
     statusre = re.compile('Status: ')
     originre = re.compile('Origin: ')
@@ -339,10 +339,10 @@ def get_package_status(package, avail=False):
         if not line: continue
 
         if confmode:
-            if line[0] != '/':
+            if line[:2] != ' /':
                 confmode = False
             else:
-                conffiles = conffiles + (line.split(),)
+                conffiles = conffiles + [tuple(line.split())]
 
         if versionre.match(line):
             (crud, pkgversion) = line.split(": ", 1)

-- 
Reportbug - reports bugs in the Debian distribution