[CalendarServer-changes] [15030] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15030
          http://trac.calendarserver.org//changeset/15030
Author:   cdaboo at apple.com
Date:     2015-08-04 13:02:13 -0700 (Tue, 04 Aug 2015)
Log Message:
-----------
Make sure that POST+split with duplicate uid fails properly.

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

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-08-04 19:55:06 UTC (rev 15029)
+++ CalendarServer/trunk/requirements-dev.txt	2015-08-04 20:02:13 UTC (rev 15030)
@@ -8,4 +8,4 @@
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15021#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15029#egg=CalDAVTester

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-08-04 19:55:06 UTC (rev 15029)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-08-04 20:02:13 UTC (rev 15030)
@@ -5240,8 +5240,11 @@
         # Do split and return new resource
         try:
             olderObject = yield self.split(rid=rid, olderUID=pastUID)
-        except (UIDExistsError, UIDExistsElsewhereError):
+        except (ObjectResourceNameAlreadyExistsError, UIDExistsError, UIDExistsElsewhereError):
             raise InvalidSplit("Chosen UID exists elsewhere.")
+        except Exception as e:
+            log.error("Unknown split exception: {}".format(str(e)))
+            raise InvalidSplit("Unknown error.")
         returnValue(olderObject)
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150804/270c6b61/attachment.html>