[CMF-checkins] CVS: CMF/CMFCore - PortalObject.py:1.3.38.4 WorkflowTool.py:1.24.4.10

[Florent Guillaume]

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

Modified Files:
      Tag: CMF-1_3-branch
	PortalObject.py WorkflowTool.py 
Log Message:
Merged changes from HEAD:

The portal root really needs to be a bona fide portalish context.

When updating role mappings, don't fail if trying to reindex
portal_catalog itself. This can happen if Folders are workflowed.



=== CMF/CMFCore/PortalObject.py 1.3.38.3 => 1.3.38.4 ===
 class PortalObjectBase(PortalFolder, SkinnableObjectManager):
 
     meta_type = 'Portal Site'
-    portal_type = None
     _isPortalRoot = 1
 
     # Ensure certain attributes come from the correct base class.


=== CMF/CMFCore/WorkflowTool.py 1.24.4.9 => 1.24.4.10 ===
                 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: