merge master

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index b06d3289421e62b1bf6ca0ed5b3b59706c4be4ee..0c73617e68591c20604ef0b7f3ed0c247d3bc36e 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) {