From fc4c746554485e319139556597228b02e6917a47 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 13 Feb 2008 18:05:45 +0000 Subject: [PATCH] Make partition detection code on windows a little more robust --- src/libprs500/devices/prs505/driver.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libprs500/devices/prs505/driver.py b/src/libprs500/devices/prs505/driver.py index b74369865e..1cef0a3324 100644 --- a/src/libprs500/devices/prs505/driver.py +++ b/src/libprs500/devices/prs505/driver.py @@ -146,11 +146,12 @@ class PRS505(Device): continue try: partition = drive.associators("Win32_DiskDriveToDiskPartition")[0] + logical_disk = partition.associators('Win32_LogicalDiskToPartition')[0] + prefix = logical_disk.DeviceID+os.sep + drives.append((drive.Index, prefix)) except IndexError: continue - logical_disk = partition.associators('Win32_LogicalDiskToPartition')[0] - prefix = logical_disk.DeviceID+os.sep - drives.append((drive.Index, prefix)) + if not drives: raise DeviceError('Unable to find %s. Is it connected?'%(self.__class__.__name__,))