[CalendarServer-changes] [10073] CalendarServer/branches/users/glyph/one-home-list-api

[source_changes at macosforge.org]

Revision: 10073
          http://trac.calendarserver.org//changeset/10073
Author:   glyph at apple.com
Date:     2012-11-16 14:49:20 -0800 (Fri, 16 Nov 2012)
Log Message:
-----------
as per tested requirement, re-raise exception in file implementation instead of logging upon abort

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/one-home-list-api/

Modified: CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py	2012-11-16 22:49:18 UTC (rev 10072)
+++ CalendarServer/branches/users/glyph/one-home-list-api/txdav/common/datastore/file.py	2012-11-16 22:49:20 UTC (rev 10073)
@@ -19,6 +19,7 @@
 Common utility functions for a file based datastore.
 """
 
+import sys
 from twext.internet.decorate import memoizedKey
 from twext.python.log import LoggingMixIn
 from txdav.xml.rfc2518 import ResourceType, GETContentType, HRef
@@ -29,7 +30,6 @@
 
 from twisted.internet.defer import succeed, inlineCallbacks, returnValue
 from twisted.python.util import FancyEqMixin
-from twisted.python import log
 from twisted.python import hashlib
 
 from twistedcaldav import customxml
@@ -143,8 +143,9 @@
             try:
                 yield action(txn, home)
             except:
-                log.err()
+                a, b, c = sys.exc_info()
                 yield txn.abort()
+                raise a, b, c
             else:
                 yield txn.commit()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121116/76089f39/attachment.html>