[CalendarServer-changes] [11309] CalendarServer/branches/users/glyph/q-delete-no-concurrency/twext/ enterprise/dal/record.py

[source_changes at macosforge.org]

Revision: 11309
          http://trac.calendarserver.org//changeset/11309
Author:   glyph at apple.com
Date:     2013-06-05 11:42:14 -0700 (Wed, 05 Jun 2013)
Log Message:
-----------
And they fail, so, back to green.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/q-delete-no-concurrency/twext/enterprise/dal/record.py

Modified: CalendarServer/branches/users/glyph/q-delete-no-concurrency/twext/enterprise/dal/record.py
===================================================================
--- CalendarServer/branches/users/glyph/q-delete-no-concurrency/twext/enterprise/dal/record.py	2013-06-05 18:42:13 UTC (rev 11308)
+++ CalendarServer/branches/users/glyph/q-delete-no-concurrency/twext/enterprise/dal/record.py	2013-06-05 18:42:14 UTC (rev 11309)
@@ -258,12 +258,13 @@
         """
         Delete this row from the database.
 
-        @return: a L{Deferred} which fires when the underlying row has been
-            deleted.
+        @return: a L{Deferred} which fires with C{None} when the underlying row
+            has been deleted, or fails with L{NoSuchRecord} if the underlying
+            row was already deleted.
         """
         return Delete(From=self.table,
                       Where=self._primaryKeyComparison(self._primaryKeyValue())
-                      ).on(self.transaction)
+                      ).on(self.transaction, raiseOnZeroRowCount=NoSuchRecord)
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130605/25de18e4/attachment.html>