Checkbox

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

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

Looks OK, I'd be concerned about an attachment named "admin" or "cadmium" being added to the dmi portion of the report due to the substring matching logic used in this change, but I guess the possibility of this happening is remote.

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-08-05 15:37:32 +0000
3+++ debian/changelog 2011-08-08 13:14:29 +0000
4@@ -27,6 +27,7 @@
5
6 [Marc Tardif]
7 * Fixed udevam not being found because /sbin not in PATH (LP: #597305)
8+ * Fixed hardware attachments for udev and dmi (LP: #822682)
9
10 [Sylvain Pineau]
11 * Expose the message store to other plugins, via firing an expose-msgstore
12
13=== modified file 'plugins/launchpad_report.py'
14--- plugins/launchpad_report.py 2011-02-02 16:57:29 +0000
15+++ plugins/launchpad_report.py 2011-08-08 13:14:29 +0000
16@@ -67,10 +67,10 @@
17 def report_attachments(self, attachments):
18 for attachment in attachments:
19 name = attachment["name"]
20- if name == "dmi":
21+ if "dmi" in name:
22 self._report["hardware"]["dmi"] = attachment["data"]
23
24- elif name == "udev":
25+ elif "udev" in name:
26 self._report["hardware"]["udev"] = attachment["data"]
27
28 else:

Subscribers

People subscribed via source and target branches