merge master

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index 39f1de62f9d3757389b2ac660626e13953ab1b10..2e5132d677eb9bc4ac82c46de37e3772498a4ff2 100644 (file)
--- 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) {