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

Fix #3160 (Sony PRS-505 not recognised since 0.6.7 installation)

Browse Source
This commit is contained in:
Kovid Goyal 2009-08-15 10:00:00 -06:00
parent e3723d1195
commit eed245a760
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,6 @@ class Device(DeviceConfig, DevicePlugin):
WINDOWS_MAIN_MEM = None WINDOWS_MAIN_MEM = None
WINDOWS_CARD_A_MEM = None WINDOWS_CARD_A_MEM = None
WINDOWS_CARD_B_MEM = None WINDOWS_CARD_B_MEM = None
ALLOW_NO_MAIN_MEMORY = False
# The following are used by the check_ioreg_line method and can be either: # The following are used by the check_ioreg_line method and can be either:
# None, a string, a list of strings or a compiled regular expression # None, a string, a list of strings or a compiled regular expression
@ -267,9 +266,6 @@ class Device(DeviceConfig, DevicePlugin):
drives['cardb'] = self.windows_get_drive_prefix(drive) drives['cardb'] = self.windows_get_drive_prefix(drive)
elif self.windows_match_device(drive, 'WINDOWS_MAIN_MEM') and not drives.get('main', None): elif self.windows_match_device(drive, 'WINDOWS_MAIN_MEM') and not drives.get('main', None):
drives['main'] = self.windows_get_drive_prefix(drive) drives['main'] = self.windows_get_drive_prefix(drive)
if not self.ALLOW_NO_MAIN_MEMORY:
raise DeviceError('Failed to find the drive corresponding'
' to the main memory')
if 'main' in drives.keys() and 'carda' in drives.keys() and \ if 'main' in drives.keys() and 'carda' in drives.keys() and \
'cardb' in drives.keys(): 'cardb' in drives.keys():
@ -277,7 +273,7 @@ class Device(DeviceConfig, DevicePlugin):
drives = self.windows_open_callback(drives) drives = self.windows_open_callback(drives)
if 'main' not in drives: if drives.get('main', None) is None:
raise DeviceError( raise DeviceError(
_('Unable to detect the %s disk drive. Try rebooting.') % _('Unable to detect the %s disk drive. Try rebooting.') %
self.__class__.__name__) self.__class__.__name__)

3
src/calibre/utils/PythonMagickWand.py
View File

@ -83,7 +83,8 @@ else:
if _lib is None: if _lib is None:
_lib = util.find_library('Wand') _lib = util.find_library('Wand')
_magick = _magick_error = None _magick = None
_magick_error = None
try: try:
_magick = ctypes.CDLL(_lib) _magick = ctypes.CDLL(_lib)
except Exception, err: except Exception, err: