From d1087fa909dfccc7c87f813bb14a6e2512479387 Mon Sep 17 00:00:00 2001 From: John Schember Date: Wed, 20 May 2009 20:21:29 -0400 Subject: [PATCH] ignore netbeans project dir. Fix error when auto converting news. --- .bzrignore | 1 + src/calibre/gui2/device.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.bzrignore b/.bzrignore index 47f754ef3c..0a44159b1e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -13,6 +13,7 @@ src/calibre/manual/cli/ build dist docs +nbproject/ src/calibre/gui2/pictureflow/Makefile.Debug src/calibre/gui2/pictureflow/Makefile.Release src/calibre/gui2/pictureflow/debug/ diff --git a/src/calibre/gui2/device.py b/src/calibre/gui2/device.py index caed0358cc..9a8595a9c7 100644 --- a/src/calibre/gui2/device.py +++ b/src/calibre/gui2/device.py @@ -640,15 +640,15 @@ class DeviceGUI(object): ', '.join(sent_mails), 3000) - def sync_news(self, send_ids=None, do_auto=True): + def sync_news(self, send_ids=None, do_auto_convert=True): if self.device_connected: ids = list(dynamic.get('news_to_be_synced', set([]))) if send_ids is None else send_ids ids = [id for id in ids if self.library_view.model().db.has_id(id)] files, _auto_ids = self.library_view.model().get_preferred_formats_from_ids( ids, self.device_manager.device_class.settings().format_map, - exclude_auto=do_auto) + exclude_auto=do_auto_convert) auto = [] - if _auto_ids: + if do_auto_convert and _auto_ids: for id in _auto_ids: formats = [f.lower() for f in self.library_view.model().db.formats(id, index_is_id=True).split(',')] formats = formats if formats != None else []