From e8b2270000a4a14b353c3be31c41d52404466599 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 27 Jul 2010 11:23:36 -0600 Subject: [PATCH] Fix regression that broke Kobo driver. Add support or 1.41 softrooted nook --- src/calibre/devices/kobo/books.py | 2 +- src/calibre/devices/nook/driver.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py index 7ee5beaec0..a5b2e98d2f 100644 --- a/src/calibre/devices/kobo/books.py +++ b/src/calibre/devices/kobo/books.py @@ -84,7 +84,7 @@ class Book(MetaInformation): def thumbnail(self): return None - def smart_update(self, other): + def smart_update(self, other, replace_metadata=False): ''' Merge the information in C{other} into self. In case of conflicts, the information in C{other} takes precedence, unless the information in C{other} is NULL. diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py index 5793dc7187..f697ee5202 100644 --- a/src/calibre/devices/nook/driver.py +++ b/src/calibre/devices/nook/driver.py @@ -26,7 +26,7 @@ class NOOK(USBMS): # Ordered list of supported formats FORMATS = ['epub', 'pdb', 'pdf'] - VENDOR_ID = [0x2080] + VENDOR_ID = [0x2080, 0x18d1] # 0x18d1 is for softrooted nook PRODUCT_ID = [0x001] BCD = [0x322]