Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'usbms-device-walk-loop-fix' of https://github.com/shastry/calibre into master

Browse Source
This commit is contained in:
Kovid Goyal 2020-09-20 14:45:43 +05:30
commit ec3110920b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/usbms/device.py
View File

@ -466,7 +466,9 @@ class Device(DeviceConfig, DevicePlugin):
for y in ('idProduct', 'idVendor', 'bcdDevice'): for y in ('idProduct', 'idVendor', 'bcdDevice'):
if not os.access(j(usb_dir, y), os.R_OK): if not os.access(j(usb_dir, y), os.R_OK):
usb_dir = None usb_dir = None
continue break
if usb_dir is None:
continue
e = lambda q : raw2num(open(j(usb_dir, q), 'rb').read().decode('utf-8')) e = lambda q : raw2num(open(j(usb_dir, q), 'rb').read().decode('utf-8'))
ven, prod, bcd = map(e, ('idVendor', 'idProduct', 'bcdDevice')) ven, prod, bcd = map(e, ('idVendor', 'idProduct', 'bcdDevice'))
if not (test(ven, 'idVendor') and test(prod, 'idProduct') and if not (test(ven, 'idVendor') and test(prod, 'idProduct') and