Merged in [16818] from rjsparks@nostrum.com:

    Make hybrid pdfs when converting ppt materials to pdf. Fixes ietf-tools#2769.
 - Legacy-Id: 16880
Note: SVN reference [16818] has been migrated to Git commit 84270a7

Author: levkowetz

ietf/settings.py

@@ -875,7 +875,7 @@ def skip_unreadable_post(record):
 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

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