Merge lp:~roadmr/checkbox/794747 into lp:checkbox

[Daniel Manrique]

The linked bug report describes an unlikely corner case where a borked package description causes malformed output from dpkg-query which in turn crashes package_resource. This fix ensures that after parsing each record, all required fields are present; failing this, it silently ignores the record.

[Brendan Donegan (brendan-donegan)]

Had to clean up the changelog a little bit, but otherwise looks pretty good. Merging.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-30 20:13:46 +0000
+++ debian/changelog	2011-10-06 20:33:27 +0000
@@ -1,8 +1,9 @@
 checkbox (0.13) oneiric; urgency=low
 
-  * Incremented version 
+  [Daniel Manrique]
+  * Ignore malformed dpkg entries in package_resource (LP: #794747)
 
- -- Daniel Manrique <[e-mail]>  Fri, 30 Sep 2011 16:12:08 -0400
+ -- Daniel Manrique <[e-mail]>  Fri, 30 Sep 2011 16:14:40 -0400
 
 checkbox (0.12.8) oneiric; urgency=low
 
 
=== modified file 'scripts/package_resource'
--- scripts/package_resource	2010-03-28 14:48:55 +0000
+++ scripts/package_resource	2011-10-06 20:33:27 +0000
@@ -51,6 +51,8 @@
         "x": "both-problems"}
 
     columns = ["desired", "status", "error", "name", "version", "description"]
+    mandatory_columns = columns[:]
+    mandatory_columns.remove("error") #this is optional
     aliases = {
         "linux-image-" + os.uname()[2]: "linux"}
 
@@ -84,6 +86,10 @@
             if value:
                 package[column] = value
 
+        #Skip records not containing all mandatory columns
+        if not set(mandatory_columns).issubset(package.keys()):
+            continue
+
         name = package["name"]
         if name in aliases:
             yield dict(package)