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]