[CalendarServer-changes] [4497] CalendarServer/branches/more-deferreds-3/twistedcaldav/method/ put_common.py

[source_changes at macosforge.org]

Revision: 4497
          http://trac.macosforge.org/projects/calendarserver/changeset/4497
Author:   william_short at apple.com
Date:     2009-08-13 12:23:01 -0700 (Thu, 13 Aug 2009)
Log Message:
-----------
fix "duplicate column UID" errors

Modified Paths:
--------------
    CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py

Modified: CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py	2009-08-13 19:23:00 UTC (rev 4496)
+++ CalendarServer/branches/more-deferreds-3/twistedcaldav/method/put_common.py	2009-08-13 19:23:01 UTC (rev 4497)
@@ -595,7 +595,8 @@
 
         # UID must be unique
         index = self.destinationparent.index()
-        if not index.isAllowedUID(uid, oldname, self.destination.fp.basename()):
+        isAllowed = yield index.isAllowedUID(uid, oldname, self.destination.fp.basename())
+        if not isAllowed:
             rname = yield index.resourceNameForUID(uid)
             # This can happen if two simultaneous PUTs occur with the same UID.
             # i.e. one PUT has reserved the UID but has not yet written the resource,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090813/3bc50aa7/attachment-0001.html>