Merge pull request #432 from collective/fix-plone6-upgrade

Fix Plone 5 related upgrade steps in Plone 6.

CHANGES.rst

@@ -5,6 +5,9 @@ Changelog
 4.2.1 (unreleased)
 ------------------
 
+- Fix Plone 5 related upgrade steps in Plone 6.
+  [thet]
+
 - Add plone.shortname behaviour to EasyForm type.
   [ThibautBorn]
 

src/collective/easyform/upgrades/__init__.py

@@ -1,12 +1,23 @@
+from importlib import import_module
 from plone import api
 
 import logging
 
 
 logger = logging.getLogger(__name__)
 
+HAS_PLONE_6 = getattr(
+    import_module("Products.CMFPlone.factory"), "PLONE60MARKER", False
+)
+
 
 def update_last_compilation(context, timetuple=None):
+    if HAS_PLONE_6:
+        # No need to update the `last_compilation` time on Plone 6.
+        # The resources are refreshed with every restart of the instance
+        # automatically.
+        return
+
     # Let's do the imports inline, so they are not needlessly done at startup.
     # Should not really matter, but oh well.
     from datetime import datetime