From 32bd1215e3387b45a10cd1947e117c5855061a35 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Wed, 27 Nov 2013 11:16:47 +0100
Subject: [PATCH] CMFActivity: ignore harmless OID mismatch after BT upgrade
---
product/CMFActivity/ActivityTool.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py
index 9ed4099317..43b968dea8 100644
--- a/product/CMFActivity/ActivityTool.py
+++ b/product/CMFActivity/ActivityTool.py
@@ -241,7 +241,9 @@ class Message(BaseMessage):
% (self.object_path,), error=sys.exc_info())
self.setExecutionState(MESSAGE_NOT_EXECUTABLE)
else:
- if self.oid and self.oid != getattr(aq_base(obj), '_p_oid', None):
+ if (self.oid and self.oid != getattr(aq_base(obj), '_p_oid', None) and
+ # XXX: BusinessTemplate must be fixed to preserve OID
+ 'portal_workflow' not in self.object_path):
raise ValueError("OID mismatch for %r" % obj)
return obj
--
2.30.9