merge conflicting on stripping spaces

[librarian.git] / librarian / mobi.py

diff --git a/librarian/mobi.py b/librarian/mobi.py
old mode 100755 (executable)
new mode 100644 (file)
index 1e7569b..491b5ee
--- a/librarian/mobi.py
+++ b/librarian/mobi.py
@@ -19,7 +19,7 @@ def transform(wldoc, verbose=False,
 
     wldoc: a WLDocument
     sample=n: generate sample e-book (with at least n paragraphs)
-    cover: a cover.Cover object
+    cover: a cover.Cover factory overriding default
     flags: less-advertising,
     """
 
@@ -34,8 +34,8 @@ def transform(wldoc, verbose=False,
     c = cover(book_info)
     c.save(cover_file)
 
-    if cover.uses_dc_cover:
-        if document.book_info.cover_by:
+    if c.uses_dc_cover:
+        if document.remobook_info.cover_by:
             document.edoc.getroot().set('data-cover-by', document.book_info.cover_by)
         if document.book_info.cover_source:
             document.edoc.getroot().set('data-cover-source', document.book_info.cover_source)
@@ -57,4 +57,4 @@ def transform(wldoc, verbose=False,
     subprocess.check_call(['ebook-convert', epub.get_filename(), output_file.name,
             '--no-inline-toc', '--cover=%s' % cover_file.name], **kwargs)
     os.unlink(cover_file.name)
-    return OutputFile.from_filename(output_file.name)
\ No newline at end of file
+    return OutputFile.from_filename(output_file.name)