[Checkins] SVN: PluggableAuthService/branches/1.4/ Merged trunk r73607:73608 into 1.4 branch.

[Stefan H. Holek]

Log message for revision 73611:
  Merged trunk r73607:73608 into 1.4 branch.
  
  Made sure the Extensions.upgrade script does not commit full
  transactions but only sets (optimistic) savepoints. Removed bogus
  Zope 2.7 compatibility in the process.
  (http://www.zope.org/Collectors/PAS/55)
  

Changed:
  U   PluggableAuthService/branches/1.4/Extensions/upgrade.py
  U   PluggableAuthService/branches/1.4/doc/CHANGES.txt

-=-
Modified: PluggableAuthService/branches/1.4/Extensions/upgrade.py
===================================================================
--- PluggableAuthService/branches/1.4/Extensions/upgrade.py	2007-03-25 15:21:36 UTC (rev 73610)
+++ PluggableAuthService/branches/1.4/Extensions/upgrade.py	2007-03-25 15:29:59 UTC (rev 73611)
@@ -31,14 +31,8 @@
 $Id$
 """
 import logging
+import transaction
 
-try:
-    import transaction
-    get_transaction = transaction.get
-except ImportError:
-    # Zope 2.7 backwards compatibility
-    pass
-
 def _write(response, tool, message):
     logger = logging.getLogger('PluggableAuthService.upgrade.%s' % tool)
     logger.info(message)
@@ -115,7 +109,7 @@
               , 'replaceRootUserFolder'
               , 'Replaced root acl_users with PluggableAuthService\n' )
 
-    get_transaction().commit()
+    transaction().savepoint(True)
 
 def _migrate_user( pas, login, password, roles ):
 
@@ -177,10 +171,10 @@
                           , ( 'Local Roles map changed for (%s)\n'
                               % '/'.join(path) ) )
             if (len(seen) % 100 ) == 0:
-                get_transaction().commit()
+                transaction.savepoint(True)
                 _write( RESPONSE
                       , 'upgradeLocalRoleAssignmentsFromRoot'
-                      , "  -- committed at object # %d\n" % len( seen ) )
+                      , "  -- Set savepoint at object # %d\n" % len( seen ) )
             if getattr(aq_base(obj), 'isPrincipiaFolderish', 0):
                 for o in obj.objectValues():
                     descend(user_folder, o)
@@ -193,7 +187,7 @@
 
     descend(self.acl_users, self)
 
-    get_transaction().commit()
+    transaction.savepoint(True)
 
 # External Method to use
 

Modified: PluggableAuthService/branches/1.4/doc/CHANGES.txt
===================================================================
--- PluggableAuthService/branches/1.4/doc/CHANGES.txt	2007-03-25 15:21:36 UTC (rev 73610)
+++ PluggableAuthService/branches/1.4/doc/CHANGES.txt	2007-03-25 15:29:59 UTC (rev 73611)
@@ -1,5 +1,14 @@
 PluggableAuthService changelog
 
+  PluggableAuthService 1.4.2 (unreleased)
+
+    Bugs Fixed
+
+      - Made sure the Extensions.upgrade script does not commit full
+        transactions but only sets (optimistic) savepoints. Removed bogus
+        Zope 2.7 compatibility in the process.
+        (http://www.zope.org/Collectors/PAS/55)
+
   PluggableAuthService 1.4.1 (2006/12/19)
 
     Bugs Fixed