[CalendarServer-changes] [12264] CalendarServer/trunk/txdav/caldav/datastore/sql.py

[source_changes at macosforge.org]

Revision: 12264
          http://trac.calendarserver.org//changeset/12264
Author:   cdaboo at apple.com
Date:     2014-01-08 07:08:08 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
Missed return from last change.

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

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2014-01-07 23:45:24 UTC (rev 12263)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2014-01-08 15:08:08 UTC (rev 12264)
@@ -2466,8 +2466,8 @@
             except InvalidICalendarDataError as e:
                 raise InvalidComponentForStoreError(str(e))
         try:
-            yield self._setComponentInternal(component, inserting, ComponentUpdateState.NORMAL, smart_merge)
-        except Exception as e:
+            result = yield self._setComponentInternal(component, inserting, ComponentUpdateState.NORMAL, smart_merge)
+        except Exception:
             ex = Failure()
 
             # If the failure is due to a txn timeout and we have the special attribute indicating it is OK to
@@ -2477,7 +2477,9 @@
 
             ex.raiseException()
 
+        returnValue(result)
 
+
     @inlineCallbacks
     def _setComponentInternal(self, component, inserting=False, internal_state=ComponentUpdateState.NORMAL, smart_merge=False, split_details=None):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/25207b49/attachment.html>