x
/
gitdm
Code Issues Proposed changes

Allow to add funky email addresses as the first field of an alias

This commit is contained in:
Cédric Bosdonnat 2011-01-27 17:01:02 +01:00 committed by Jonathan Corbet
parent aac3e8ccc8
commit 47f284e68d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ConfigFile.py
View File

@ -43,12 +43,12 @@ def ReadEmailAliases (name):
croak ('Unable to open email alias file %s' % (name))
line = ReadConfigLine (file)
while line:
sline = line.split ()
if len (sline) != 2:
m = re.match ('^("[^"]+"|\S+)\s+(.+)$', line)
if not m or len (m.groups ()) != 2:
croak ('Funky email alias line "%s"' % (line))
if sline[0].find ('@') <= 0 or sline[1].find ('@') <= 0:
if m and m.group (2).find ('@') <= 0:
croak ('Non-addresses in email alias "%s"' % (line))
database.AddEmailAlias (sline[0], sline[1])
database.AddEmailAlias (m.group (1).replace ('"', ''), m.group (2))
line = ReadConfigLine (file)
file.close ()