[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.10 setupZopeOrg.py:1.65

[Sidnei da Silva]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv18555/Extensions

Modified Files:
	NZOMigrate.py setupZopeOrg.py 
Log Message:
latest fixes on ownership

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.9 => 1.10 ===
     try: changed = ob._p_changed
     except: changed = 0
 
-    owner = getattr(ob, '_owner', None)
+    owner = ob.getOwner(info=1)
     if owner:
         udb, uid = owner
         #res.append('Owner of %s is %s!%s' % (
@@ -498,11 +498,11 @@
         return ignore_path
 
     def fixOwnership(self, orig, new):
-        owner = getattr(orig, '_owner', None)
+        owner = orig.getOwner()
         if owner is not None:
             try:
                 # Retain ownership.
-                new._owner = owner
+                new.changeOwnership(owner)
             except: pass
         return new
 


=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.64 => 1.65 ===
               )
 
 SKINS = ( 'nzo',
-          'zopeorg_products'
+          'zopeorg_types'
         )
 
 ADD_INDEXES = ()
@@ -232,14 +232,14 @@
     setupFeedbackActions(portal)
 
     # Create a Members BTreeFolder
-    log.append('\n * Creating a Members BTreeFolder')
+    #log.append('\n * Creating a Members BTreeFolder')
     
-    if ( 'Members' in portal.objectIds() and 
-         getattr( portal, 'Members' ).meta_type in ( 'Folder',
-                                                     'Portal Folder',
-                                                     'Plone Folder') ):
-        portal._delObject( 'Members' )
-        manage_addCMFBTreeFolder( portal, 'Members', 'Member Folder' )
+    #if ( 'Members' in portal.objectIds() and 
+    #     getattr( portal, 'Members' ).meta_type in ( 'Folder',
+    #                                                 'Portal Folder',
+    #                                                 'Plone Folder') ):
+    #    portal._delObject( 'Members' )
+    #    manage_addCMFBTreeFolder( portal, 'Members', 'Member Folder' )
 
     # Setting up other external methods for conversion and synchronization
     log.append('\n * Setting up external methods')