Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 05:22:52 +02:00
Code Issues Projects Releases Wiki Activity

More intelligent error message on trying to convert DRMed lit files.

Browse source
This commit is contained in:
Kovid Goyal 2007-12-04 22:08:56 +00:00
parent 3ae1612c8b
commit 619773526e
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libprs500/ebooks/lrf/lit/convert_from.py
View file

@ -39,13 +39,16 @@ def generate_html(pathtolit, logger):
sep = r'\\' if iswindows else os.path.sep
cmd = ' '.join([CLIT, '"'+pathtolit+'"', '"%s"'%(tdir+sep,)])
logger.debug(cmd)
p = Popen(cmd, shell=True, stderr=PIPE, stdout=PIPE)
p = Popen(cmd, shell=True, stderr=PIPE, stdout=PIPE)
stdout = p.stdout.read()
err = p.stderr.read()
logger.info(p.stdout.read())
ret = p.wait()
if ret != 0:
if os.path.exists(tdir) and os.path.isdir(tdir):
shutil.rmtree(tdir)
err = p.stderr.read()
shutil.rmtree(tdir)
if 'keys.txt' in unicode(err)+unicode(stdout):
raise ConversionError('This lit file is protected by DRM. You must first use the ConvertLIT program to remove the DRM.')
raise ConversionError, err
return tdir