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

Fix #2403 (Conversion of comics fails on OS X when run from CLI)

Browse Source
This commit is contained in:
Kovid Goyal 2009-05-08 14:49:26 -07:00
parent f371247347
commit 42b08c0022
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/parallel.py
View File

@ -166,8 +166,10 @@ class WorkerMother(object):
self.gui_executable = os.path.join(contents, 'MacOS', self.gui_executable = os.path.join(contents, 'MacOS',
os.path.basename(sys.executable)) os.path.basename(sys.executable))
contents = os.path.join(contents, 'console.app', 'Contents') contents = os.path.join(contents, 'console.app', 'Contents')
self.executable = os.path.join(contents, 'MacOS', exe = os.path.basename(sys.executable)
os.path.basename(sys.executable)) if 'python' not in exe:
exe = 'python'
self.executable = os.path.join(contents, 'MacOS', exe)
resources = os.path.join(contents, 'Resources') resources = os.path.join(contents, 'Resources')
fd = os.path.join(contents, 'Frameworks') fd = os.path.join(contents, 'Frameworks')
@ -503,9 +505,9 @@ class Overseer(object):
self.job.update_status(percent, msg) self.job.update_status(percent, msg)
elif word == 'ERROR': elif word == 'ERROR':
self.write('OK') self.write('OK')
exception, traceback = cPickle.loads(msg) exception, tb = cPickle.loads(msg)
self.job.output(u'%s\n%s'%(exception, traceback)) self.job.output(u'%s\n%s'%(exception, tb))
self.job.exception, self.job.traceback = exception, traceback self.job.exception, self.job.traceback = exception, tb
return True return True
else: else:
self.terminate() self.terminate()