[CalendarServer-changes] [12370] twext/trunk/twext/who/ldap/_util.py

[source_changes at macosforge.org]

Revision: 12370
          http://trac.calendarserver.org//changeset/12370
Author:   wsanchez at apple.com
Date:     2014-01-16 19:48:40 -0800 (Thu, 16 Jan 2014)
Log Message:
-----------
minor

Modified Paths:
--------------
    twext/trunk/twext/who/ldap/_util.py

Modified: twext/trunk/twext/who/ldap/_util.py
===================================================================
--- twext/trunk/twext/who/ldap/_util.py	2014-01-17 03:02:21 UTC (rev 12369)
+++ twext/trunk/twext/who/ldap/_util.py	2014-01-17 03:48:40 UTC (rev 12370)
@@ -87,8 +87,10 @@
 
     if MatchFlags.NOT in flags:
         notOp = LDAPMatchFlags.NOT.value
+        operand = LDAPOperand.AND.value
     else:
         notOp = u""
+        operand = LDAPOperand.OR.value
 
     # FIXME: It doesn't look like LDAP queries can be case sensitive.
     # This would mean that it's up to the callers to filter out the false
@@ -123,11 +125,6 @@
     # target field name.
 
     if notOp:
-        operand = LDAPOperand.AND.value
-    else:
-        operand = LDAPOperand.OR.value
-
-    if notOp:
         valueOperand = LDAPOperand.OR.value
     else:
         valueOperand = LDAPOperand.AND.value
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/e985a844/attachment.html>