Better support for odder msgid headers

Found an In-Reply-To that was not just a <foo>, so handle those cases
better with a regex.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/get-lore-mbox.py b/get-lore-mbox.py
index bfe8b0b..e3599ed 100755
--- a/get-lore-mbox.py
+++ b/get-lore-mbox.py
@@ -202,9 +202,12 @@ def git_add_trailers(payload, trailers):
 
 
 def get_clean_msgid(msg, header='Message-ID'):
-    msgid = msg.get(header)
-    if msgid:
-        msgid = msg.get(header).strip().strip('<>')
+    msgid = None
+    raw = msg.get(header)
+    if raw:
+        matches = re.search(r'<([^>]+)>', raw)
+        if matches:
+            msgid = matches.groups()[0]
     return msgid