Merge lp:~cr3/checkbox/printable into lp:checkbox

Proposed by Marc Tardif
Status: Merged
Merged at revision: 1142
Proposed branch: lp:~cr3/checkbox/printable
Merge into: lp:checkbox
Diff against target: 32 lines (+3/-1)
2 files modified
debian/changelog (+1/-0)
plugins/launchpad_report.py (+2/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/printable
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+84849@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Awesome, fixes a problem I was having. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-12-06 22:08:08 +0000
3+++ debian/changelog 2011-12-07 21:38:25 +0000
4@@ -14,6 +14,7 @@
5 * Refactored install script to be agnostic of variant name.
6 * Using title defined in user_interface plugin in GTK interface.
7 * Updated default.whitelist to reflect renamed jobs.
8+ * Removed files with non-printable characters from submission.xml.
9
10 [Daniel Manrique]
11 * Update control files under debian/ to eliminate (most) lintian warnings
12
13=== modified file 'plugins/launchpad_report.py'
14--- plugins/launchpad_report.py 2011-10-13 19:53:56 +0000
15+++ plugins/launchpad_report.py 2011-12-07 21:38:25 +0000
16@@ -19,6 +19,7 @@
17 import os
18
19 from gettext import gettext as _
20+from string import printable
21
22 from checkbox.lib.safe import safe_make_directory
23
24@@ -80,7 +81,7 @@
25 elif "udev_attachment" in name:
26 self._report["hardware"]["udev"] = attachment["data"]
27
28- else:
29+ elif all(c in printable for c in attachment["data"]):
30 self._report["context"].append({
31 "command": attachment["command"],
32 "data": attachment["data"]})

Subscribers

People subscribed via source and target branches