[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.33

[Sidnei da Silva]

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

Modified Files:
	NZOMigrate.py 
Log Message:
Small reordering

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.32 => 1.33 ===
                         continue
 
                     try:
-                        new_obj = fixOwnership(obj, new_obj)
+                        new_obj = copyProperties(obj, new_obj)
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
                     try:
-                        new_obj = copyProperties(obj, new_obj)
+                        massPublish(new_obj, 0)
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
-                    res = []
                     try:
-                        res = _cleanupOwnership(new_obj, res, 0)
-                        if res != []:
-                            self.log('\n'.join(res) + '\n')
+                        new_obj = fixOwnership(obj, new_obj)
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
+                    res = []
                     try:
-                        massPublish(new_obj, 0)
+                        res = _cleanupOwnership(new_obj, res, 0)
+                        if res != []:
+                            self.log('\n'.join(res) + '\n')
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
@@ -1241,9 +1241,9 @@
                                               self._exceptions, \
                                               self._count, debug=self._debug).run(), dup=0)
 
-                        #if source_id == 'Members':
-                        #    res = recursiveOwnerFix(new_obj, oid, 1)
-                        #    setLocalRoles(new_obj, (oid, ), 'Owner', obj_url)
+                        if source_id == 'Members':
+                            res = recursiveOwnerFix(new_obj, oid, 1)
+                            setLocalRoles(new_obj, (oid, ), 'Owner', obj_url)
 
                     try:
                         new_obj = fixModificationDate(obj, new_obj)