[CalendarServer-changes] [9296] CalendarServer/branches/users/glyph/uuid-normalize/txdav/common/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 9296
          http://trac.macosforge.org/projects/calendarserver/changeset/9296
Author:   glyph at apple.com
Date:     2012-05-24 13:34:39 -0700 (Thu, 24 May 2012)
Log Message:
-----------
Abort the upgrade transaction if there's nothing to do.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/uuid-normalize/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/glyph/uuid-normalize/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/uuid-normalize/txdav/common/datastore/sql.py	2012-05-24 20:34:35 UTC (rev 9295)
+++ CalendarServer/branches/users/glyph/uuid-normalize/txdav/common/datastore/sql.py	2012-05-24 20:34:39 UTC (rev 9296)
@@ -4225,6 +4225,7 @@
     else:
         log.msg("No potentially denormalized UUIDs detected, "
                 "skipping normalization upgrade.")
+        yield t.abort()
         returnValue(None)
     try:
         yield _normalizeHomeUUIDsIn(t, ECALENDARTYPE)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120524/782fbf83/attachment.html>