diff options
author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-01-27 17:01:02 +0100 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2011-02-17 10:24:05 -0700 |
commit | 47f284e68d169670094cbd36422511d0885e7132 (patch) | |
tree | 31a19f6e059190c3da5ccf64c5652d329ce0a005 | |
parent | aac3e8ccc8029d4a1d308d852b4724e843867138 (diff) |
Allow to add funky email addresses as the first field of an alias
-rw-r--r-- | ConfigFile.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ConfigFile.py b/ConfigFile.py index 4b7a9ce..041289e 100644 --- a/ConfigFile.py +++ b/ConfigFile.py @@ -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 () |