[CalendarServer-changes] [9624] CalendarServer/branches/users/glyph/q

source_changes at macosforge.org source_changes at macosforge.org
Sat Aug 11 01:55:01 PDT 2012


Revision: 9624
          http://trac.macosforge.org/projects/calendarserver/changeset/9624
Author:   glyph at apple.com
Date:     2012-08-11 01:55:01 -0700 (Sat, 11 Aug 2012)
Log Message:
-----------
Oops, do the other upcall case the same way for Delete too.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/q/

Modified: CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py
===================================================================
--- CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py	2012-08-11 08:55:00 UTC (rev 9623)
+++ CalendarServer/branches/users/glyph/q/twext/enterprise/dal/syntax.py	2012-08-11 08:55:01 UTC (rev 9624)
@@ -1575,10 +1575,13 @@
 
     @inlineCallbacks
     def on(self, txn, *a, **kw):
+        upcall = lambda: super(Delete, self).on(txn, *a, **kw)
         if txn.dialect == SQLITE_DIALECT and self.Return is not None:
             result = yield Select(self._returnAsList(), From=self.From,
                                   Where=self.Where).on(txn, *a, **kw)
-        yield super(Delete, self).on(txn, *a, **kw)
+            yield upcall()
+        else:
+            result = yield upcall()
         returnValue(result)
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120811/2693db99/attachment.html>


More information about the calendarserver-changes mailing list