[CMF-checkins] CVS: CMF/CMFCore - WorkflowTool.py:1.24.4.7

[Florent Guillaume]

Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv14752

Modified Files:
      Tag: CMF-1_3-branch
	WorkflowTool.py 
Log Message:

Merged change from HEAD:

When updating role mappings, don't fail if trying to reindex
portal_catalog itself.


=== CMF/CMFCore/WorkflowTool.py 1.24.4.6 => 1.24.4.7 ===
                 count = count + 1
                 if hasattr(aq_base(ob), 'reindexObject'):
                     # Reindex security-related indexes
-                    ob.reindexObject(idxs=['allowedRolesAndUsers'])
+                    try:
+                        ob.reindexObject(idxs=['allowedRolesAndUsers'])
+                    except TypeError:
+                        # Catch attempts to reindex portal_catalog.
+                        pass
         if hasattr(aq_base(ob), 'objectItems'):
             obs = ob.objectItems()
             if obs: