From d1e336c3dd25a7b93a8e91e274a24c56ccb18fb1 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 19 May 2011 16:11:05 -0600 Subject: [PATCH 1/2] Removed log statement left over from debugging title_sort xform --- src/calibre/devices/apple/driver.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 42949215b2..66c2819e28 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -2743,7 +2743,6 @@ class ITUNES(DriverBase): # Update metadata from plugboard # If self.plugboard is None (no transforms), original metadata is returned intact metadata_x = self._xform_metadata_via_plugboard(metadata, this_book.format) - self.log("metadata.title_sort: %s metadata_x.title_sort: %s" % (metadata.title_sort, metadata_x.title_sort)) if isosx: if lb_added: lb_added.name.set(metadata_x.title) From 6c33b59cd7fc347038f265b372887b18ccd6015d Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 2 Jun 2011 03:40:52 -0600 Subject: [PATCH 2/2] Added diagnostic in _launch_iTunes to assist in identifying failure in ticket #791530 --- src/calibre/devices/apple/driver.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 66c2819e28..d15f4070a7 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -3023,6 +3023,8 @@ class ITUNES_ASYNC(ITUNES): pythoncom.CoInitialize() self._launch_iTunes() except: + import traceback + traceback.print_exc() raise UserFeedback('unable to launch iTunes', details=None, level=UserFeedback.WARN) finally: pythoncom.CoUninitialize()