Merge ~sylvain-pineau/plainbox-provider-resource:fix-1851473 into plainbox-provider-resource:master

[Sylvain Pineau]

Fixes linked bug

ID: com.canonical.certification::usb
Category: com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
 WARNING: Failure to read usb.ids
(<class 'FileNotFoundError'>, FileNotFoundError(2, 'No such file or directory'), <traceback object at 0x7fb0288a1048>)
usb2: supported
 WARNING: Failure to read usb.ids
(<class 'FileNotFoundError'>, FileNotFoundError(2, 'No such file or directory'), <traceback object at 0x7f095acedfc8>)
usb3: unsupported

[Sylvain Pineau (sylvain-pineau)]

self-approved

review: Approve

diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index b4adb11..a520deb 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -218,6 +218,7 @@ requires: package.name == "x11-xserver-utils"
 _summary: Creates display resource info from xrandr output
 
 id: usb
+template-engine: jinja2
 estimated_duration: 0.33
 plugin: resource
 _description: Creates resource info for supported USB versions
@@ -225,11 +226,11 @@ _summary: Collect information about supported types of USB
 command:
  for version in 2 3; do
      echo -n "usb$version: "
-     if [[ -v SNAP ]]; then
-         checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids | grep -q "Linux Foundation ${version}.00 root hub" && echo "supported" || echo "unsupported"
-     else
-         lsusb | grep -q "Linux Foundation ${version}.0 root hub" && echo "supported" || echo "unsupported"
-     fi
+ {%- if __on_ubuntucore__ %}
+     checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids | grep -q "Linux Foundation ${version}.00 root hub" && echo "supported" || echo "unsupported"
+ {%- else %}
+     lsusb | grep -q "Linux Foundation ${version}.0 root hub" && echo "supported" || echo "unsupported"
+ {% endif -%}
  done
 
 id: xinput