summaryrefslogtreecommitdiffstats
path: root/openstack/common/setup.py
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2012-06-28 15:55:31 -0700
committerJoe Gordon <jogo@cloudscaling.com>2012-06-28 15:55:31 -0700
commit90ae2f7a3db5eba091937127ed6acb386c14bdcd (patch)
tree22b47d83e795223aa91f741815f83f8123e2ecad /openstack/common/setup.py
parentae2c6f0c93a1c1bdb2dd503978ef912547114f55 (diff)
downloadoslo-90ae2f7a3db5eba091937127ed6acb386c14bdcd.tar.gz
oslo-90ae2f7a3db5eba091937127ed6acb386c14bdcd.tar.xz
oslo-90ae2f7a3db5eba091937127ed6acb386c14bdcd.zip
Fix mailmap.
Mailmap was broken in 01cec1dcb1a0b8d6a0ba098f8e18ab3c0f7cabab Revert offending line only to get unit tests passing again. Change-Id: I33e8d5d3587b429d44ae60f34ca2f132ce233793
Diffstat (limited to 'openstack/common/setup.py')
-rw-r--r--openstack/common/setup.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py
index 59c8049..140d37b 100644
--- a/openstack/common/setup.py
+++ b/openstack/common/setup.py
@@ -35,7 +35,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