Commit aefd0a2c authored by root's avatar root

Local production changes

parent a62a8f40
......@@ -1689,6 +1689,7 @@ class SkinTemplateItem(ObjectTemplateItem):
# Do not register skin which were explicitely ask not to be installed
if not force and update_dict.get(relative_url) == 'nothing':
continue
__traceback_info__ = (relative_url,)
folder = self.unrestrictedResolveValue(p, relative_url)
for obj in folder.objectValues(spec=('Z SQL Method',)):
fixZSQLMethod(p, obj)
......
......@@ -319,7 +319,7 @@ class Image(TextConvertableMixin, File, OFSImage):
def _resize(self, quality, width, height, format, resolution, frame):
"""Resize and resample photo."""
parameter_list = ['convert', '-colorspace', 'sRGB', '-depth', '8',
parameter_list = ['/usr/bin/timeout', '10', 'convert', '-colorspace', 'sRGB', '-depth', '8',
'-quality', str(quality),
'-geometry', '%sx%s' % (width, height)]
if format not in VALID_TRANSPARENT_IMAGE_FORMAT_LIST:
......
......@@ -125,6 +125,7 @@ except ImportError:
class pyPdfGeneric:
NameObject = type('NameObject', (str, ), {'__module__': 'pyPdf.Generic'})
sys.modules['pyPdf.generic'] = pyPdfGeneric
sys.modules['pyPdf.Generic'] = pyPdfGeneric
sys.modules['pyPdf'] = pyPdfGeneric
......@@ -1018,6 +1018,7 @@ class Catalog(Folder,
# It could also have a performance impact for traversals to objects in
# the acquisition context on Zope 2.12 even when it didn't raise a weird
# error.
if not uid: return None
method = getattr(self, self.sql_getitem_by_uid)
search_result = method(uid = uid)
if len(search_result) > 0:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment