little fixs

This commit is contained in:
Nicolas Coevoet 2013-12-01 21:48:08 +01:00
parent 66acb2cd36
commit d235f1abc7

View File

@ -168,7 +168,6 @@ def match (pattern,n,irc):
if len(p): if len(p):
# remove ':' # remove ':'
p = p[1:] p = p[1:]
log.debug('match :: %s --> %s / %s / %s' % (pattern,t,p,negate))
if t == 'a': if t == 'a':
cache[key] = matchAccount (pattern,p,negate,n,extprefix) cache[key] = matchAccount (pattern,p,negate,n,extprefix)
elif t == 'r': elif t == 'r':
@ -176,10 +175,10 @@ def match (pattern,n,irc):
elif t == 'x': elif t == 'x':
cache[key] = matchGecos (pattern,p,negate,n,extprefix) cache[key] = matchGecos (pattern,p,negate,n,extprefix)
else: else:
k = pattern[(pattern.find(':')+1):] k = pattern[(pattern.rfind(':')+1):]
cache[key] = matchHostmask(k,n) cache[key] = matchHostmask(k,n)
elif pattern.find(':') != -1: elif pattern.find(':') != -1:
p = pattern[(pattern.find(':')+1):] p = pattern[(pattern.rfind(':')+1):]
cache[key] = matchHostmask(p,n) cache[key] = matchHostmask(p,n)
else: else:
if ircutils.isUserHostmask(pattern): if ircutils.isUserHostmask(pattern):