Merge ~jocave/plainbox-provider-resource:fix-usb-resource-core into plainbox-provider-resource:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Sylvain Pineau
Approved revision: f4750b1c526c4ceaca7deb698475417930572ca2
Merged at revision: 1c22ff465f34c827dd2a6b595be7b07061099a39
Proposed branch: ~jocave/plainbox-provider-resource:fix-usb-resource-core
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+382518@code.launchpad.net

Description of the change

Fix bad whitespace control in the templated job definition causing the usb resource to fail on when run on Ubuntu Core.

Tested on both Ubuntu Core and classic devices.

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

+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 ffac737..cbf4fa5 100644
3--- a/jobs/resource.pxu
4+++ b/jobs/resource.pxu
5@@ -228,7 +228,7 @@ command:
6 echo -n "usb$version: "
7 {%- if __on_ubuntucore__ %}
8 checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids | grep -q "Linux Foundation ${version}.00 root hub" && echo "supported" || echo "unsupported"
9- {%- else %}
10+ {% else %}
11 lsusb | grep -q "Linux Foundation ${version}.0 root hub" && echo "supported" || echo "unsupported"
12 {% endif -%}
13 done

Subscribers

People subscribed via source and target branches