From: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Thu, 27 Jan 2011 16:01:02 +0000 (+0100)
Subject: Allow to add funky email addresses as the first field of an alias
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=47f284e68d169670094cbd36422511d0885e7132;p=people%2Flarsk%2Fxenproject-org-gitdm.git

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

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 ()