# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1208429704 -3600
# Node ID 21d9048136dcda5a5131d9058baff17d55651d4e
# Parent  1efc50c61a26078f74f0f2703cc487624ead8c1e# Parent  2935e7232bd31d051eb11985b2a944f74a6c6615
merge fixes

diff -r 1efc50c61a26 -r 21d9048136dc hg-ssh
--- a/hg-ssh	Thu Apr 17 11:54:30 2008 +0100
+++ b/hg-ssh	Thu Apr 17 11:55:04 2008 +0100
@@ -52,7 +52,7 @@
     pattern = pattern.replace("*", "[%s]*" % allowedchars)
     return re.compile(pattern + "$").match(match) is not None
 
-def testrule(rulefile keyname, path, applicable):
+def testrule(rulefile, keyname, path, applicable):
     goodpath(keyname)
     goodpath(path)
     f = open(rulefile)