From f8bdb15ac068577f4e0cd067dcab1626098daea0 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Tue, 18 Jul 2017 10:24:30 +0200
Subject: jobs:suspend: Add device.category == 'CARDREADER' to mediacard jobs

To be consistent with their "before suspend" siblings.

Fixes: LP:1704093
---
 jobs/suspend.txt.in | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/jobs/suspend.txt.in b/jobs/suspend.txt.in
index 64c05f1..a267a21 100644
--- a/jobs/suspend.txt.in
+++ b/jobs/suspend.txt.in
@@ -2223,6 +2223,9 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/mmc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2270,6 +2273,9 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2319,6 +2325,9 @@ category_id: com.canonical.plainbox::suspend
 id: suspend/sdhc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2367,6 +2376,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/cf-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2414,6 +2426,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/sdxc-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2461,6 +2476,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/ms-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2508,6 +2526,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/msp-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
@@ -2555,6 +2576,9 @@ category_id: com.canonical.plainbox::suspend
 id: mediacard/xd-insert-after-suspend
 estimated_duration: 30.0
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks2' or snap.name == 'udisks2'
+ device.category == 'CARDREADER'
 command: removable_storage_watcher --memorycard insert sdio usb scsi
 _description:
  PURPOSE:
-- 
cgit v1.2.3


From 0d1361737f52976de4b90675178a233fbd41f5f1 Mon Sep 17 00:00:00 2001
From: Sylvain Pineau <sylvain.pineau@canonical.com>
Date: Tue, 18 Jul 2017 10:25:48 +0200
Subject: bin: Fix bt_connect import statement

Fixes: LP:1703791
---
 bin/bt_connect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/bt_connect b/bin/bt_connect
index b52642a..1fed30e 100755
--- a/bin/bt_connect
+++ b/bin/bt_connect
@@ -23,7 +23,7 @@
 import sys
 import time
 
-import checkbox_support.bt_helper
+import checkbox_support.bt_helper as bt_helper
 
 from argparse import ArgumentParser
 
-- 
cgit v1.2.3