merge changes from dla source

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 26b8a84a8434e7469a1127ab23f1b8894cf9345a..0e67f581783266c7f2e1ad2312fc78941f7c5f5f 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -291,6 +291,10 @@ my %split_fields =
      affects        => \&splitpackages,
      blocks         => $ditch_empty_space,
      blockedby      => $ditch_empty_space,
+     # this isn't strictly correct, but we'll split both of them for
+     # the time being until we ditch all use of keywords everywhere
+     # from the code
+     keywords       => $ditch_empty_space,
      tags           => $ditch_empty_space,
      found_versions => $ditch_empty_space,
      fixed_versions => $ditch_empty_space,

diff --git a/scripts/process b/scripts/process
index f0047dbc4d94c6cab69e10cdf872c6f941ce09d8..2ffbdf965424efae835c7d3980bacdd7e214a53c 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -1074,7 +1074,7 @@ sub checkmaintainers {
     my $anymaintfound=0; my $anymaintnotfound=0;
     for my $p (splitpackages($data->{package})) {
         $p =~ y/A-Z/a-z/;
-       $p =~ /([a-z0-9.+-]+)/;
+       $p =~ /((?:src:)?[a-z0-9.+-]+)/;
        $p = $1;
        next unless defined $p;
        if (defined $gSubscriptionDomain) {