altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
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
This commit is contained in:
Henrik Levkowetz 2019-10-21 13:17:33 +00:00
parent c474b42f2d
commit 45465f1174
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/settings.py
View file

@ -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

3
ietf/utils/log.py
View file

@ -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