X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/be746e7226154f253ae529372778ecd216fd3ee5..df992d5a864942d572f0235cf9bf124050f790a8:/stgit/commands/common.py diff --git a/stgit/commands/common.py b/stgit/commands/common.py index 2985379..4bfa4dd 100644 --- a/stgit/commands/common.py +++ b/stgit/commands/common.py @@ -175,12 +175,15 @@ def push_patches(patches, check_merged = False): def name_email(address): """Return a tuple consisting of the name and email parsed from a - standard 'name ' string + standard 'name ' or 'email (name)' string """ address = re.sub('[\\\\"]', '\\\\\g<0>', address) str_list = re.findall('^(.*)\s*<(.*)>\s*$', address) if not str_list: - raise CmdException, 'Incorrect "name " string: %s' % address + str_list = re.findall('^(.*)\s*\((.*)\)\s*$', address) + if not str_list: + raise CmdException, 'Incorrect "name "/"email (name)" string: %s' % address + return ( str_list[0][1], str_list[0][0] ) return str_list[0]