Conversion: Fix a regression i nthe previous release that caused conversion of EPUB 3 to EPUB 3 to fail. Fixes #1779518 [failed: Convert book n of n](https://bugs.launchpad.net/calibre/+bug/1779518)

This commit is contained in:
Kovid Goyal 2018-07-03 17:31:45 +05:30
parent 774890af68
commit 38ce6eb3e5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -298,7 +298,7 @@ class EPUBOutput(OutputFormatPlugin):
from calibre.ebooks.oeb.polish.upgrade import epub_2_to_3
existing_nav = getattr(self.opts, 'epub3_nav_parsed', None)
nav_href = getattr(self.opts, 'epub3_nav_href', None)
previous_nav = (existing_nav, nav_href) if existing_nav and nav_href else None
previous_nav = (nav_href, existing_nav) if existing_nav and nav_href else None
epub_2_to_3(container, self.log.info, previous_nav=previous_nav)
fix_conversion_titlepage_links_in_nav(container)
container.commit()