From 34ee1999cfce5f358dd09467d46b2640f356b988 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 29 Nov 2013 11:45:09 -0800
Subject: [PATCH] merge master

---
 Debbugs/Common.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index b06d3289..0c73617e 100644
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -497,8 +497,11 @@ sub __add_to_hash {
     binmode($fh,':encoding(UTF-8)');
     while (<$fh>) {
 	chomp;
-        next unless m/^(\S+)\s+(\S.*\S)\s*$/;
-        my ($key,$value)=($1,$2);
+        my @elements = split /\t/;
+        next unless @elements >=2;
+        # we do this because the source maintainer file contains the
+        # archive location, which we don't care about
+        my ($key,$value)=($elements[0],$elements[-1]);
 	$key = lc $key;
 	$forward->{$key}= $value;
 	if (defined $reverse) {
-- 
2.47.3