diff options
| author | Bhuvan Arumugam <bhuvan@apache.org> | 2012-05-04 22:20:09 -0700 |
|---|---|---|
| committer | Bhuvan Arumugam <bhuvan@apache.org> | 2012-05-04 22:24:35 -0700 |
| commit | cf0a8a78b33bcdc6694af87fdd978ef4d9616c14 (patch) | |
| tree | 37aa76503e246796200b59faec57040f205ecb90 /openstack/common/setup.py | |
| parent | e57e9860f40be27cd389a5f02c0d1a113a21861e (diff) | |
| download | oslo-cf0a8a78b33bcdc6694af87fdd978ef4d9616c14.tar.gz oslo-cf0a8a78b33bcdc6694af87fdd978ef4d9616c14.tar.xz oslo-cf0a8a78b33bcdc6694af87fdd978ef4d9616c14.zip | |
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 'openstack/common/setup.py')
| -rw-r--r-- | openstack/common/setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |