From 2e7e2a33824a3008b9a0226b12462917df8df46b Mon Sep 17 00:00:00 2001 From: GRiker Date: Tue, 13 Nov 2012 03:56:47 -0700 Subject: [PATCH] Fixed a problem occurring when merging comments with a custom field whose type is a list. --- src/calibre/library/catalogs/epub_mobi_builder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py index 10c3103cef..468c32a8f8 100644 --- a/src/calibre/library/catalogs/epub_mobi_builder.py +++ b/src/calibre/library/catalogs/epub_mobi_builder.py @@ -4615,6 +4615,8 @@ class CatalogBuilder(object): index_is_id=True) if addendum is None: addendum = '' + elif type(addendum) is list: + addendum = (', '.join(addendum)) include_hr = eval(self.merge_comments_rule['hr']) if self.merge_comments_rule['position'] == 'before': merged = addendum @@ -4631,10 +4633,12 @@ class CatalogBuilder(object): merged += '\n' merged += addendum else: - # Return the custom field contents + # Return only the custom field contents merged = self.db.get_field(record['id'], self.merge_comments_rule['field'], index_is_id=True) + if type(merged) is list: + merged = (', '.join(merged)) return merged