Removed decorate_acl_methods from instance-debug to avoid ZODB.POSExc…

…eption.ConflictError in migration
IMIO · Sep 3, 2022 · 28c0726 · 28c0726
1 parent b3c86b5
commit 28c0726
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/base.cfg b/base.cfg
@@ -69,7 +69,6 @@ zope-conf-additional =
 environment-vars =
   PYTHON_EGG_CACHE ${buildout:directory}/python-eggs
   zope_i18n_compile_mo_files true
-#  ENABLE_PRINTING_MAILHOST True
   OO_PORT ${port:oo-port}
   PYTHON_UNO ${port:python-uno}
   PUBLIC_URL ${port:public-url}

diff --git a/prod.cfg b/prod.cfg
@@ -79,6 +79,7 @@ environment-vars +=
   zope_i18n_allowed_languages fr en
   PTS_LANGUAGES fr en
   ZC_ASYNC_UUID ${buildout:directory}/var/uuid-instance.txt
+#  ENABLE_PRINTING_MAILHOST True
 
 [instance2]
 <= instance1
@@ -125,6 +126,8 @@ zope-conf-additional =
   </product-config>
   ${zope-conf:additional}
   publisher-profile-file ${buildout:directory}/profile.dat
+environment-vars -=
+  decorate_acl_methods true
 
 [instance-amqp]
 <= instance1
@@ -143,6 +146,8 @@ zope-conf-additional =
   </product-config>
   ${zope-conf:additional}
   ${zope-conf:amqp}
+environment-vars -=
+  decorate_acl_methods true
 
 [instance-async]
 <= instance1