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

skip osx detection if identifier is not set

Browse Source
This commit is contained in:
John Schember 2009-01-10 08:06:44 -05:00
parent 049e7b202b
commit afab0395d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,8 @@ class Device(_Device):
VENDOR_NAME = '' VENDOR_NAME = ''
PRODUCT_NAME = '' PRODUCT_NAME = ''
OSX_NAME_MAIN_MEM = '' OSX_NAME_MAIN_MEM = None
OSX_NAME_CARD_MEM = '' OSX_NAME_CARD_MEM = None
MAIN_MEMORY_VOLUME_LABEL = '' MAIN_MEMORY_VOLUME_LABEL = ''
STORAGE_CARD_VOLUME_LABEL = '' STORAGE_CARD_VOLUME_LABEL = ''
@ -207,9 +207,9 @@ class Device(_Device):
break break
for i, line in enumerate(lines): for i, line in enumerate(lines):
if line.strip().endswith('<class IOMedia>') and self.OSX_NAME_MAIN_MEM in line: if self.OSX_NAME_MAIN_MEM is not None and line.strip().endswith('<class IOMedia>') and self.OSX_NAME_MAIN_MEM in line:
get_dev_node(lines[i+1:], 'main') get_dev_node(lines[i+1:], 'main')
if line.strip().endswith('<class IOMedia>') and self.OSX_NAME_CARD_MEM in line: if self.OSX_NAME_CARD_MEM is not None and line.strip().endswith('<class IOMedia>') and self.OSX_NAME_CARD_MEM in line:
get_dev_node(lines[i+1:], 'card') get_dev_node(lines[i+1:], 'card')
if len(names.keys()) == 2: if len(names.keys()) == 2:
break break