Merge ~jocave/plainbox-provider-resource:snap-fix-lsusb into plainbox-provider-resource:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: c533fc56c22691e12a8f458dc92a4f1661f79be3
Merged at revision: 6a334654a955ceef18bc11a56eacb6ba1c757da3
Proposed branch: ~jocave/plainbox-provider-resource:snap-fix-lsusb
Merge into: plainbox-provider-resource:master
Diff against target: 13 lines (+1/-1)
1 file modified
jobs/resource.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+369385@code.launchpad.net

Description of the change

The usb resource was reliant on something providing the lsusb.py script on the PATH. This used to happen because a launcher was added in most snaps, but that has been removed and we shouldnt rely on it anyway in a provider.

MR was proposed to add the script to checkbox-support, this moves the job over to it.

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

LGTM, +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/resource.pxu b/jobs/resource.pxu
2index 9c142e4..b7b4ea0 100644
3--- a/jobs/resource.pxu
4+++ b/jobs/resource.pxu
5@@ -220,7 +220,7 @@ command:
6 for version in 2 3; do
7 echo -n "usb$version: "
8 if [[ -v SNAP ]]; then
9- lsusb.py -f $SNAP/var/lib/usbutils/usb.ids | grep -q "Linux Foundation ${version}.00 root hub" && echo "supported" || echo "unsupported"
10+ checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids | grep -q "Linux Foundation ${version}.00 root hub" && echo "supported" || echo "unsupported"
11 else
12 lsusb | grep -q "Linux Foundation ${version}.0 root hub" && echo "supported" || echo "unsupported"
13 fi

Subscribers

People subscribed via source and target branches