From bf973de56f037c6f586e34f6e9a0bc07110c88ba Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 1 May 2009 15:27:07 -0700
Subject: [PATCH] version 0.5.10

---
 src/calibre/constants.py              |  2 +-
 src/calibre/devices/eb600/driver.py   | 11 +++++++++--
 src/calibre/devices/jetbook/driver.py |  7 ++-----
 src/calibre/devices/usbms/device.py   | 10 +++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index f5fd6f1c9c..a30bfa7516 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.5.9'
+__version__   = '0.5.10'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 '''
 Various run time constants.
diff --git a/src/calibre/devices/eb600/driver.py b/src/calibre/devices/eb600/driver.py
index 44690655a0..4b9204ebd0 100755
--- a/src/calibre/devices/eb600/driver.py
+++ b/src/calibre/devices/eb600/driver.py
@@ -2,6 +2,13 @@ __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 '''
 Device driver for the Netronix EB600
+
+Windows PNP strings:
+ ('USBSTOR\\DISK&VEN_NETRONIX&PROD_EBOOK&REV_062E\\6&1A275569&0&EB6001009
+2W00000&0', 2, u'F:\\')
+        ('USBSTOR\\DISK&VEN_NETRONIX&PROD_EBOOK&REV_062E\\6&1A275569&0&EB6001009
+2W00000&1', 3, u'G:\\')
+
 '''
 
 from calibre.devices.usbms.driver import USBMS
@@ -30,8 +37,8 @@ class EB600(USBMS):
     SUPPORTS_SUB_DIRS = True
 
     def windows_sort_drives(self, drives):
-        main = drives['main']
-        card = drives['card']
+        main = drives.get('main', None)
+        card = drives.get('card', None)
         if card and main and card < main:
             drives['main'] = card
             drives['card'] = main
diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py
index 5d53bd5b74..3fb9b1cdd1 100644
--- a/src/calibre/devices/jetbook/driver.py
+++ b/src/calibre/devices/jetbook/driver.py
@@ -23,9 +23,6 @@ class JETBOOK(USBMS):
     WINDOWS_MAIN_MEM = 'EBOOK'
     WINDOWS_CARD_MEM = 'EBOOK'
 
-    WINDOWS_MAIN_MEM = None
-    WINDOWS_CARD_MEM = None
-
     OSX_MAIN_MEM = None
     OSX_CARD_MEM = None
 
@@ -110,8 +107,8 @@ class JETBOOK(USBMS):
         return mi
 
     def windows_sort_drives(self, drives):
-        main = drives['main']
-        card = drives['card']
+        main = drives.get('main', None)
+        card = drives.get('card', None)
         if card and main and card < main:
             drives['main'] = card
             drives['card'] = main
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 5bcc384b00..ec021edb3b 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -196,15 +196,15 @@ class Device(_Device):
             if 'main' in drives.keys() and 'card' in drives.keys():
                 break
 
-        drives = self.windows_sort_drives(drives)
-        self._main_prefix = drives.get('main')
-        self._card_prefix = drives.get('card')
-
-        if not self._main_prefix:
+        if 'main' not in drives:
             raise DeviceError(
                 _('Unable to detect the %s disk drive. Try rebooting.') %
                 self.__class__.__name__)
 
+        drives = self.windows_sort_drives(drives)
+        self._main_prefix = drives.get('main')
+        self._card_prefix = drives.get('card', None)
+
     def get_osx_mountpoints(self, raw=None):
         if raw is None:
             ioreg = '/usr/sbin/ioreg'