Merge branch 'release-0.4.1'
Conflicts: mediagoblin/_version.py
This commit is contained in:
@@ -23,4 +23,4 @@
|
||||
|
||||
# see http://www.python.org/dev/peps/pep-0386/
|
||||
|
||||
__version__ = "0.4.1.dev"
|
||||
__version__ = "0.5.0.dev"
|
||||
|
||||
@@ -250,8 +250,8 @@ def process_pdf(proc_state):
|
||||
else:
|
||||
pdf_filename = queued_filename.rsplit('.', 1)[0] + '.pdf'
|
||||
unoconv = where('unoconv')
|
||||
call(executable=unoconv,
|
||||
args=[unoconv, '-v', '-f', 'pdf', queued_filename])
|
||||
Popen(executable=unoconv,
|
||||
args=[unoconv, '-v', '-f', 'pdf', queued_filename]).wait()
|
||||
if not os.path.exists(pdf_filename):
|
||||
_log.debug('unoconv failed to convert file to pdf')
|
||||
raise BadMediaFail()
|
||||
|
||||
Reference in New Issue
Block a user