[Reportbug-commits] r560 - in trunk (debian/changelog reportbug reportbuglib/reportbug.py)

[morph-guest at users.alioth.debian.org]

    Date: Friday, July 4, 2008 @ 17:29:13
  Author: morph-guest
Revision: 560

reports status of suggested packages; Closes: #441056

Modified:
  trunk/debian/changelog
  trunk/reportbug
  trunk/reportbuglib/reportbug.py

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-02 09:03:31 UTC (rev 559)
+++ trunk/debian/changelog	2008-07-04 17:29:13 UTC (rev 560)
@@ -1,12 +1,17 @@
-reportbug (3.43) UNRELEASED; urgency=medium
+reportbug (3.43~devel) UNRELEASED; urgency=medium
 
   [ Ben Finney ]
   * reportbuglib/reportbug_ui_urwid.py
     + Ensure 'spawn_editor' is available for 'urwid' interface
       (closes: #488928).
 
- -- Ben Finney <ben+debian at benfinney.id.au>  Wed, 02 Jul 2008 18:47:18 +1000
+  [ Sandro Tosi ]
+  * reportbuglib/reportbug.py, reportbug
+    - reports status of suggested packages; thanks to Ari Pollak for the
+      report; Closes: #441056
 
+ -- Sandro Tosi <matrixhasu at gmail.com>  Fri, 04 Jul 2008 18:44:16 +0200
+
 reportbug (3.42) unstable; urgency=low
 
   [ Sandro Tosi ]

Modified: trunk/reportbug
===================================================================
--- trunk/reportbug	2008-07-02 09:03:31 UTC (rev 559)
+++ trunk/reportbug	2008-07-04 17:29:13 UTC (rev 560)
@@ -1071,6 +1071,7 @@
         pkgavail = maintainer = origin = src_name = state = ''
         depends = []
         recommends = []
+        suggests = []
         conffiles = []
         reportinfo = None
         isvirtual = (package in sysinfo.get('otherpkgs', {}).keys() and
@@ -1210,7 +1211,7 @@
 
             (pkgversion, pkgavail, depends, recommends, conffiles, maintainer,
              installed, origin, vendor, reportinfo, priority, desc, src_name,
-             fulldesc, state) = status
+             fulldesc, state, suggests) = status
 
         buginfo = '/usr/share/bug/' + package
         bugexec = submitas = submitto = presubj = None
@@ -1424,11 +1425,11 @@
 
         depinfo = ""
         # Grab dependency list, removing version conditions.
-        if (depends or recommends) and not self.options.kudos:
+        if (depends or recommends or suggests) and not self.options.kudos:
             ewrite("Looking up dependencies of %s...\n", package)
             depinfo = (reportbug.get_dependency_info(package, depends) +
-                       reportbug.get_dependency_info(package, recommends,
-                                                     "recommends"))
+                       reportbug.get_dependency_info(package, recommends, "recommends") +
+                       reportbug.get_dependency_info(package, suggests, "suggests"))
 
         if reportwith and not self.options.kudos:
             for extrapackage in reportwith:

Modified: trunk/reportbuglib/reportbug.py
===================================================================
--- trunk/reportbuglib/reportbug.py	2008-07-02 09:03:31 UTC (rev 559)
+++ trunk/reportbuglib/reportbug.py	2008-07-04 17:29:13 UTC (rev 560)
@@ -276,6 +276,7 @@
     priorityre = re.compile('Priority: ')
     dependsre = re.compile('(Pre-)?Depends: ')
     recsre = re.compile('Recommends: ')
+    suggestsre = re.compile('Suggests: ')
     conffilesre = re.compile('Conffiles: ')
     maintre = re.compile('Maintainer: ')
     statusre = re.compile('Status: ')
@@ -291,6 +292,7 @@
     fulldesc = []
     depends = []
     recommends = []
+    suggests = []
     confmode = False
     state = ''
 
@@ -346,6 +348,12 @@
             thisdepends = [[y.split()[0] for y in x.split('|')]
                            for x in (thisdepends.split(', '))]
             recommends.extend(thisdepends)
+        elif suggestsre.match(line):
+            (crud, thisdepends) = line.split(": ", 1)
+            # Remove versioning crud
+            thisdepends = [[y.split()[0] for y in x.split('|')]
+                           for x in (thisdepends.split(', '))]
+            suggests.extend(thisdepends)
         elif conffilesre.match(line):
             confmode = True
         elif maintre.match(line):
@@ -377,7 +385,7 @@
     info = (pkgversion, pkgavail, tuple(depends), tuple(recommends),
             tuple(conffiles),
             maintainer, installed, origin, vendor, reportinfo, priority,
-            desc, src_name, os.linesep.join(fulldesc), state)
+            desc, src_name, os.linesep.join(fulldesc), state, tuple(suggests))
 
     if not avail:
         statuscache[package] = info