# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1303120365 -3600
# Node ID 9875791ab421fac2d23decf94c58fa7f4a347377
# Parent  6feeef02c05791de070509d78981d0b47d7d1e89
Fix error in rule matching: False overrides None even if later

diff -r 6feeef02c057 -r 9875791ab421 src/mercurialserver/ruleset.py
--- a/src/mercurialserver/ruleset.py	Thu Apr 14 18:21:23 2011 +0100
+++ b/src/mercurialserver/ruleset.py	Mon Apr 18 10:52:45 2011 +0100
@@ -19,15 +19,16 @@
 def rule(pairs):
     matchers = [(k, globmatcher(v)) for k, v in pairs]
     def c(kw):
+        best = True
         for k, m in matchers:
             if k not in kw:
                 return False
             kkw = kw[k]
             if kkw is None:
-                return None
-            if m.match(kkw) is None:
+                best = None
+            elif m.match(kkw) is None:
                 return False
-        return True
+        return best
     return c
 
 class Ruleset(object):