[CalendarServer-changes] [9947] CalendarServer/trunk/calendarserver/tools/shell/vfs.py

[source_changes at macosforge.org]

Revision: 9947
          http://trac.calendarserver.org//changeset/9947
Author:   wsanchez at apple.com
Date:     2012-10-16 17:57:58 -0700 (Tue, 16 Oct 2012)
Log Message:
-----------
txn.abort() is async

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/shell/vfs.py

Modified: CalendarServer/trunk/calendarserver/tools/shell/vfs.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell/vfs.py	2012-10-17 00:52:02 UTC (rev 9946)
+++ CalendarServer/trunk/calendarserver/tools/shell/vfs.py	2012-10-17 00:57:58 UTC (rev 9947)
@@ -285,7 +285,7 @@
             for home in (yield txn.addressbookHomes()):
                 addResult(home.uid())
         finally:
-            txn.abort()
+            (yield txn.abort())
 
         returnValue(results.itervalues())
 
@@ -406,7 +406,7 @@
                         home = (yield txn.calendarHomeWithUID(self.uid, create=False))
                         assert home
                     finally:
-                        txn.abort()
+                        (yield txn.abort())
 
                 if home:
                     self._children["calendars"] = CalendarHomeFolder(
@@ -439,7 +439,7 @@
                         home = (yield txn.addressbookHomeWithUID(self.uid, create=False))
                         assert home
                     finally:
-                        txn.abort()
+                        (yield txn.abort())
 
                 if home:
                     self._children["addressbooks"] = AddressBookHomeFolder(
@@ -449,7 +449,7 @@
                         self.record,
                     )
             finally:
-                txn.abort()
+                (yield txn.abort())
 
         self._didInitChildren = True
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121016/93e55072/attachment-0001.html>