Archives/multibootusb
2
0
Fork 0
mirror of https://github.com/mbusb/multibootusb synced 2024-11-01 15:40:16 +00:00
Code Issues Projects Releases Wiki Activity

scripts/usb.py: use device.get() instead of device[''] to handle KeyError

Browse Source 
The devices returned by list_devices() may not always have all the
properties and referencing them raises a KeyError. Use the .get()
interface as suggested by the upstream[0] to avoid such exceptions.

[0] http://pyudev.readthedocs.io/en/latest/guide.html#id6
This commit is contained in:
Göktürk Yüksek 2017-01-26 19:59:11 -05:00
parent be4c8d9763
commit 938d31412e
No known key found for this signature in database
GPG Key ID: 84F802E5C088CE33
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/usb.py
View File

@ -102,7 +102,7 @@ def list(partition=1, fixed=None):
ID_FS_USAGE="filesystem", ID_TYPE="disk",
ID_BUS="usb"):
# if device['ID_BUS'] == "usb" and device['DEVTYPE'] == "partition":
if device['ID_BUS'] in ("usb", "scsi") and device['DEVTYPE'] == "partition":
if device.get('ID_BUS') in ("usb", "scsi") and device.get('DEVTYPE') == "partition":
# gen.log(device['DEVNAME'])
devices.append(str(device['DEVNAME']))
else:
@ -205,7 +205,7 @@ def details_udev(usb_disk_part):
vendor = 'No_Vendor'
model = 'No_Model'
label = 'No_Label'
elif device['ID_BUS'] in ("usb", "scsi") and device['DEVTYPE'] == "partition":
elif device.get('ID_BUS') in ("usb", "scsi") and device.get('DEVTYPE') == "partition":
if (device['DEVNAME']) == usb_disk_part:
uuid = str(device['ID_FS_UUID'])
file_system = str(device['ID_FS_TYPE'])