From be35539b095ccffd656d3943393da4696608471f Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Tue, 23 Aug 2016 15:41:41 +0200
Subject: [PATCH] fixup! PortalTransforms: refresh transforms in internal
 structure in reloadTransforms().

---
 product/PortalTransforms/TransformEngine.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/product/PortalTransforms/TransformEngine.py b/product/PortalTransforms/TransformEngine.py
index 22a6400a02..1c796667a1 100644
--- a/product/PortalTransforms/TransformEngine.py
+++ b/product/PortalTransforms/TransformEngine.py
@@ -13,6 +13,7 @@ from Products.CMFCore.ActionProviderBase import ActionProviderBase
 from Products.CMFCore.permissions import ManagePortal, View
 from Products.CMFCore.utils import registerToolInterface, UniqueObject
 from Products.CMFCore.utils import getToolByName
+from Products.MimetypesRegistry.common import MimeTypeException
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from Products.PortalTransforms.data import datastream
@@ -549,15 +550,11 @@ class TransformTool(UniqueObject, ActionProviderBase, Folder):
             reloaded.append((id, o.module))
             try:
                 self._unmapTransform(o)
-            except ConflictError:
-                raise
-            except:
+            except MimeTypeException:
                 pass
             try:
                 self._mapTransform(o)
-            except ConflictError:
-                raise
-            except:
+            except MimeTypeException:
                 pass
         return reloaded
 
-- 
2.30.9