[CalendarServer-changes] [12827] twext/trunk/twext/who/opendirectory/_service.py

[source_changes at macosforge.org]

Revision: 12827
          http://trac.calendarserver.org//changeset/12827
Author:   sagen at apple.com
Date:     2014-03-05 18:54:11 -0800 (Wed, 05 Mar 2014)
Log Message:
-----------
Provide info about duplicate records

Modified Paths:
--------------
    twext/trunk/twext/who/opendirectory/_service.py

Modified: twext/trunk/twext/who/opendirectory/_service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/_service.py	2014-03-06 02:53:39 UTC (rev 12826)
+++ twext/trunk/twext/who/opendirectory/_service.py	2014-03-06 02:54:11 UTC (rev 12827)
@@ -546,11 +546,17 @@
                 MatchExpression(self.fieldName.shortNames, shortName),
                 recordType=recordType
             )
-            returnValue(
-                uniqueResult(
-                    (yield self._recordsFromQuery(query))
+            try:
+                results = yield self._recordsFromQuery(query)
+                record = uniqueResult(results)
+                returnValue(record)
+            except DirectoryServiceError:
+                self.log.error(
+                    "Duplicate records for name: {n} ({rt})".format(
+                        n=shortName, rt=recordType.name
+                    )
                 )
-            )
+                raise
 
         except QueryNotSupportedError:
             # Let the superclass try
@@ -730,7 +736,14 @@
         returnValue(members)
 
 
+    # @inlineCallbacks
+    # FIXME: need to implement
+    def groups(self):
+        groups = set()
+        return succeed(groups)
 
+
+
 class NoQOPDigestCredentialFactory(DigestCredentialFactory):
     """
     DigestCredentialFactory without qop, to interop with OD.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140305/d98fb6dc/attachment-0001.html>