diff options
| -rwxr-xr-x | bin/removable_storage_test | 11 | ||||
| -rwxr-xr-x | manage.py | 2 |
2 files changed, 6 insertions, 7 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 @@ -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, |