Merge ~jocave/plainbox-provider-resource:udev-add-mmal-catergory into plainbox-provider-resource:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: e1ea7343a0e49d35a83a69989192351a605ca82f
Merged at revision: fc5ca8c2292763d5510cb16d025555cd46bea0af
Proposed branch: ~jocave/plainbox-provider-resource:udev-add-mmal-catergory
Merge into: plainbox-provider-resource:master
Diff against target: 27 lines (+5/-4)
1 file modified
bin/udev_resource (+5/-4)
Reviewer Review Type Date Requested Status
Sheila Miguez (community) Approve
Review via email: mp+377764@code.launchpad.net

Description of the change

Update the script used in the devices job with knowledge of the MMAL category added in:

https://code.launchpad.net/~jocave/checkbox-support/+git/checkbox-support/+merge/377659

To post a comment you must log in.
Revision history for this message
Sheila Miguez (codersquid) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/udev_resource b/bin/udev_resource
2index 468ffdc..23ec94a 100755
3--- a/bin/udev_resource
4+++ b/bin/udev_resource
5@@ -27,9 +27,9 @@ from subprocess import check_output, CalledProcessError
6 from checkbox_support.parsers.udevadm import UdevadmParser
7
8 categories = ("ACCELEROMETER", "AUDIO", "BLUETOOTH", "CAPTURE", "CARDREADER",
9- "CDROM", "DISK", "KEYBOARD", "INFINIBAND", "MOUSE", "NETWORK",
10- "OTHER", "PARTITION", "TOUCHPAD", "TOUCHSCREEN", "USB", "VIDEO",
11- "WIRELESS", "WWAN")
12+ "CDROM", "DISK", "KEYBOARD", "INFINIBAND", "MMAL", "MOUSE",
13+ "NETWORK", "OTHER", "PARTITION", "TOUCHPAD", "TOUCHSCREEN",
14+ "USB", "VIDEO", "WIRELESS", "WWAN")
15
16 attributes = ("path", "name", "bus", "category", "driver", "product_id",
17 "vendor_id", "subproduct_id", "subvendor_id", "product",
18@@ -89,7 +89,8 @@ class UdevResultLister:
19 pid = device.product_id if device.product_id else 0
20 if not p:
21 p = getattr(device, "interface", "Unknow product")
22- self._data[c].append("{} {} [{:04x}:{:04x}]".format(v, p, vid, pid))
23+ self._data[c].append(
24+ "{} {} [{:04x}:{:04x}]".format(v, p, vid, pid))
25
26
27 def main():

Subscribers

People subscribed via source and target branches