From cf0a8a78b33bcdc6694af87fdd978ef4d9616c14 Mon Sep 17 00:00:00 2001
From: Bhuvan Arumugam <bhuvan@apache.org>
Date: Fri, 4 May 2012 22:20:09 -0700
Subject: Truly handle mailmap entries for all combinations.

Bug: 994957

Mailmap might contain mapping with full name. This commit fixes
it to handle these combinations:
  Foo ZZ <email@foo.com> Bar YY <email@bar.com>
  Foo <email@foo.com> Bar <email@bar.com>
  <email@foo.com> <email@bar.com>

This is inline with mailmap convention described here:
  http://man.github.com/git/git-shortlog.html

* openstack/common/setup.py
  parse_mailmap(): Pull out canonical and alias email addresses.

Change-Id: Iabe9612efecbd18f7a5b0725de7d2515ab24125d
---
 openstack/common/setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'openstack')

diff --git a/openstack/common/setup.py b/openstack/common/setup.py
index 60c731a..2c16b5b 100644
--- a/openstack/common/setup.py
+++ b/openstack/common/setup.py
@@ -31,7 +31,8 @@ def parse_mailmap(mailmap='.mailmap'):
         for l in fp:
             l = l.strip()
             if not l.startswith('#') and ' ' in l:
-                canonical_email, alias = l.split(' ')
+                canonical_email, alias = [x for x in l.split(' ') \
+                                         if x.startswith('<')]
                 mapping[alias] = canonical_email
     return mapping
 
-- 
cgit