[CalendarServer-changes] [8927] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory/opendirectorybacker.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Mar 23 16:50:09 PDT 2012


Revision: 8927
          http://trac.macosforge.org/projects/calendarserver/changeset/8927
Author:   gaya at apple.com
Date:     2012-03-23 16:50:09 -0700 (Fri, 23 Mar 2012)
Log Message:
-----------
fix dsquery.expression.NOT

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-03-23 19:09:30 UTC (rev 8926)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-03-23 23:50:09 UTC (rev 8927)
@@ -521,7 +521,7 @@
                         if len(matchList) > 1:
                             expr = dsquery.expression( dsquery.expression.OR, matchList )
                         else:
-                            expr = matchList
+                            expr = matchList[0]
                         return (False, queryAttributes, [dsquery.expression( dsquery.expression.NOT, expr),])
                 #end isNotDefinedExpression()
 
@@ -691,7 +691,7 @@
                             if len(matchList) > 1:
                                 expr = dsquery.expression( dsquery.expression.OR, matchList )
                             else:
-                                expr = matchList
+                                expr = matchList[0]
                             return (False, queryAttributes, [dsquery.expression( dsquery.expression.NOT, expr),])
                         else:
                             return andOrExpression(propFilterAllOf, queryAttributes, matchList)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120323/6a3df278/attachment-0001.html>


More information about the calendarserver-changes mailing list