From 45465f11743973563507928a9a4d4b7ab931e4a2 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 21 Oct 2019 13:17:33 +0000 Subject: [PATCH] Merged in [16818] from rjsparks@nostrum.com: Make hybrid pdfs when converting ppt materials to pdf. Fixes #2769. - Legacy-Id: 16880 Note: SVN reference [16818] has been migrated to Git commit 84270a71d0e7373c5e05ddc834e91c445a1296ed --- ietf/settings.py | 2 +- ietf/utils/log.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ietf/settings.py b/ietf/settings.py index 7113a26ee..b90f5f0c1 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -875,7 +875,7 @@ SECR_BLUE_SHEET_URL = '//datatracker.ietf.org/documents/blue_sheet.rtf' SECR_INTERIM_LISTING_DIR = '/a/www/www6/meeting/interim' SECR_MAX_UPLOAD_SIZE = 40960000 SECR_PROCEEDINGS_DIR = '/a/www/www6s/proceedings/' -SECR_PPT2PDF_COMMAND = ['/usr/bin/soffice','--headless','--convert-to','pdf','--outdir'] +SECR_PPT2PDF_COMMAND = ['/usr/bin/soffice','--headless','--convert-to','pdf:writer_globaldocument_pdf_Export','--outdir'] STATS_REGISTRATION_ATTENDEES_JSON_URL = 'https://ietf.org/registration/attendees/{number}' NEW_PROCEEDINGS_START = 95 USE_ETAGS=True diff --git a/ietf/utils/log.py b/ietf/utils/log.py index 814eef044..8fe9466c2 100644 --- a/ietf/utils/log.py +++ b/ietf/utils/log.py @@ -114,8 +114,7 @@ def assertion(statement, state=True): frame = stack[0][0] value = eval(statement, frame.f_globals, frame.f_locals) if bool(value) != bool(state): - settings.DEBUG = False - if settings.DEBUG is True or settings.SERVER_MODE == 'test' : + if (settings.DEBUG is True) or (settings.SERVER_MODE == 'test') : raise AssertionError("Assertion failed: '%s': %s != %s." % (statement, repr(value), state)) else: # build a simulated traceback object