Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2016-01-19 21:05:35 +05:30
parent 94b7eb174b
commit 78fcc5cd6c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/oeb/polish/split.py
View File

@ -477,7 +477,7 @@ def merge(container, category, names, master):
if len(names) < 2: if len(names) < 2:
raise AbortError('Must specify at least two files to be merged') raise AbortError('Must specify at least two files to be merged')
if master not in names: if master not in names:
raise AbortError('The master file must be one of the files being merged') raise AbortError('The master file (%s) must be one of the files being merged' % master)
if category == 'text': if category == 'text':
merge_html(container, names, master) merge_html(container, names, master)