record new upstream branch created by importing plainbox-provider-checkbox_0.48.0~rc3.orig.tar.gz and merge it

3 files changed, 13 insertions, 14 deletions

diff --git a/bin/removable_storage_test b/bin/removable_storage_test
index a7abdfe..249911a 100755
--- a/bin/removable_storage_test
+++ b/bin/removable_storage_test
@@ -391,12 +391,11 @@ class DiskTest():
 interconnect_speed * 10 ** 6)
 else:
 self.rem_disks_speed[dev_file] = None
- # We need to skip-non memory cards if we look for memory cards and
- # vice-versa so let's inspect the drive and use heuristics to
- # detect memory cards (a memory card reader actually) now.
- if self.memorycard != is_memory_card(drive_props['Vendor'],
- drive_props['Model'],
- drive_props['Media']):
+ # Ensure it is a media card reader if this was explicitly requested
+ drive_is_reader = is_memory_card(
+ drive_props['Vendor'], drive_props['Model'],
+ drive_props['Media'])
+ if self.memorycard and not drive_is_reader:
 continue
 # The if/else test below simply distributes the mount_point to the
 # appropriate variable, to keep the API requirements. It is
diff --git a/debian/.git-dpm b/debian/.git-dpm
index b7d0f3b..3cae6be 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-e78e8e86240c00fe003b7e7a93834567edd14061
-e78e8e86240c00fe003b7e7a93834567edd14061
-e78e8e86240c00fe003b7e7a93834567edd14061
-e78e8e86240c00fe003b7e7a93834567edd14061
-plainbox-provider-checkbox_0.48.0~rc2.orig.tar.gz
-727d5a7bf8d748960fa8afc62a2b89ead558dcef
-1942623
+2d0a36387628a261b1f0d09210dd8b08c225b902
+2d0a36387628a261b1f0d09210dd8b08c225b902
+2d0a36387628a261b1f0d09210dd8b08c225b902
+2d0a36387628a261b1f0d09210dd8b08c225b902
+plainbox-provider-checkbox_0.48.0~rc3.orig.tar.gz
+fc2d747526db5626dce2578c953524c241b1ecb6
+1942646
diff --git a/manage.py b/manage.py
index f00a334..c6891b1 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@ from plainbox.provider_manager import N_
 setup(
 name='plainbox-provider-checkbox',
 namespace='com.canonical.certification',
- version="0.48.0rc2",
+ version="0.48.0rc3",
 description=N_("Checkbox provider"),
 gettext_domain='plainbox-provider-checkbox',
 strict=False, deprecated=False,