diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-18 17:02:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-18 17:02:14 +0000 |
| commit | 69c569dfde0241a43bca7f34f9866d17b5270669 (patch) | |
| tree | f337de41b9c89ca232ad9d0989945316a5190a39 /keystone/openstack | |
| parent | 5a053843f9b8c3423883d5fdf1dc11032de23de9 (diff) | |
| parent | fd7df12e3dba97760c1eb2a3d8bd782bbf633a24 (diff) | |
| download | keystone-69c569dfde0241a43bca7f34f9866d17b5270669.tar.gz keystone-69c569dfde0241a43bca7f34f9866d17b5270669.tar.xz keystone-69c569dfde0241a43bca7f34f9866d17b5270669.zip | |
Merge "Truly handle mailmap entries for all combinations."
Diffstat (limited to 'keystone/openstack')
| -rw-r--r-- | keystone/openstack/common/setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/keystone/openstack/common/setup.py b/keystone/openstack/common/setup.py index 60c731a9..2c16b5b3 100644 --- a/keystone/openstack/common/setup.py +++ b/keystone/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 |