[CalendarServer-changes] [11192] CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py

[source_changes at macosforge.org]

Revision: 11192
          http://trac.calendarserver.org//changeset/11192
Author:   sagen at apple.com
Date:     2013-05-15 11:17:40 -0700 (Wed, 15 May 2013)
Log Message:
-----------
Reorder to capture failure right away

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py	2013-05-15 17:02:51 UTC (rev 11191)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrade.py	2013-05-15 18:17:40 UTC (rev 11192)
@@ -124,8 +124,8 @@
             actual_version = int(actual_version)
             yield sqlTxn.commit()
         except (RuntimeError, ValueError):
+            f = Failure()
             self.log_error("Database key %s cannot be determined." % (self.versionKey,))
-            f = Failure()
             yield sqlTxn.abort()
             if self.defaultKeyValue is None:
                 f.raiseException()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130515/9df0fafe/attachment.html>