[CalendarServer-changes] [10804] CalendarServer/trunk/twext/who/aggregate.py

[source_changes at macosforge.org]

Revision: 10804
          http://trac.calendarserver.org//changeset/10804
Author:   wsanchez at apple.com
Date:     2013-02-25 11:58:00 -0800 (Mon, 25 Feb 2013)
Log Message:
-----------
Actually keeping track of seeing types is key to complaining whether you've already seen one.

Modified Paths:
--------------
    CalendarServer/trunk/twext/who/aggregate.py

Modified: CalendarServer/trunk/twext/who/aggregate.py
===================================================================
--- CalendarServer/trunk/twext/who/aggregate.py	2013-02-22 19:38:11 UTC (rev 10803)
+++ CalendarServer/trunk/twext/who/aggregate.py	2013-02-25 19:58:00 UTC (rev 10804)
@@ -26,7 +26,6 @@
 
 from itertools import chain
 
-#from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.defer import gatherResults, FirstError
 
 from twext.who.idirectory import DirectoryConfigurationError
@@ -54,6 +53,7 @@
                         "Aggregated services may not vend the same record type: %s"
                         % (recordType,)
                     )
+                recordTypes.add(recordType)
 
         BaseDirectoryService.__init__(self, realmName)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130225/cad86388/attachment.html>