From 8bb4c38cce5862a67b824a83049cf9a9f4c5c37d Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo@cloudscaling.com>
Date: Thu, 28 Jun 2012 15:55:31 -0700
Subject: Fix mailmap.

Mailmap was broken in 01cec1dcb1a0b8d6a0ba098f8e18ab3c0f7cabab

Revert offending line only to get unit tests passing again.

Change-Id: I33e8d5d3587b429d44ae60f34ca2f132ce233793
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 59c8049..140d37b 100644
--- a/setup.py
+++ b/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
 
-- 
cgit v1.2.1