summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorBhuvan Arumugam <bhuvan@apache.org>2012-05-04 22:20:09 -0700
committerBhuvan Arumugam <bhuvan@apache.org>2012-05-04 22:24:35 -0700
commit51c2ee33fe1388536526015acbef51cf5899b3d0 (patch)
treeebd2f69b8b67cff38fee6f077ad2514b235121e5 /setup.py
parentfad4cc5ce6474e8dd3da50e1015b9afb0c835187 (diff)
downloadpbr-51c2ee33fe1388536526015acbef51cf5899b3d0.tar.gz
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
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 60c731a..2c16b5b 100644
--- a/setup.py
+++ b/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