Merge lp:~brendan-donegan/checkbox/bug1196531 into lp:checkbox

[Brendan Donegan]

To try and more sensibly handle the situation where a particular attachment is not relevant to a particular platform, this branch fixes the logic in the launchpad_report plugin to simply not include attachments in the submission.xml whose job state is 'unsupported'

[Zygmunt Krynicki (zyga)]

+1

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-28 14:03:18 +0000
+++ checkbox-old/debian/changelog	2013-07-01 15:40:40 +0000
@@ -1,6 +1,8 @@
 checkbox (0.16.6) UNRELEASED; urgency=low
 
-  * Incremented changelog
+  [ Brendan Donegan ]
+  * plugins/launchpad_report.py - Don't include attachments which have a status
+    of 'unsupported' (LP: #1196531)
 
  -- Brendan Donegan <[e-mail]>  Fri, 28 Jun 2013 15:02:58 +0100
 

=== modified file 'checkbox-old/plugins/launchpad_report.py'
--- checkbox-old/plugins/launchpad_report.py	2013-05-29 07:50:30 +0000
+++ checkbox-old/plugins/launchpad_report.py	2013-07-01 15:40:40 +0000
@@ -98,7 +98,8 @@
             elif "udev_attachment" in name:
                 self._report["hardware"]["udev"] = attachment["data"]
 
-            elif all(c in printable for c in attachment["data"]):
+            elif (all(c in printable for c in attachment["data"]) and
+                  attachment['status'] != 'unsupported'):
                 self._report["context"].append({
                     "command": attachment["command"],
                     "data": attachment["data"]})