merge changes from dla source

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 613cb2e7f9cf1a0a4bef8019f8895a2660b8ab40..6d0fafba445333f7a2d101f6b554968263bd78b2 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -107,7 +107,7 @@ BEGIN{
 
 use Debbugs::Config qw(:config);
 use Debbugs::Common qw(:lock buglog :misc get_hashname);
-use Debbugs::Status qw(bug_archiveable :read :hook writebug splitpackages split_status_fields);
+use Debbugs::Status qw(bug_archiveable :read :hook writebug splitpackages split_status_fields get_bug_status);
 use Debbugs::CGI qw(html_escape);
 use Debbugs::Log qw(:misc);
 use Debbugs::Recipients qw(:add);
@@ -2799,6 +2799,9 @@ sub __check_limit{
     my $transcript = globify_scalar(exists $param{transcript}?$param{transcript}:undef);
     my $going_to_fail = 0;
     for my $data (@data) {
+       $data = get_bug_status(bug => $data->{bug_num},
+                              status => dclone($data),
+                             );
        for my $field (keys %{$param{limit}}) {
            next unless exists $param{limit}{$field};
            my $match = 0;

diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm
index 0e67f581783266c7f2e1ad2312fc78941f7c5f5f..00516b404d30ddd0bfbf56f954ea6e5fdcc119d0 100644 (file)
--- a/Debbugs/Status.pm
+++ b/Debbugs/Status.pm
@@ -1067,7 +1067,7 @@ sub get_bug_status {
         my @source;
         for my $package (@packages) {
             next if $package eq '';
-            if ($package =~ /^src\:$/) {
+            if ($package =~ /^src\:(.+)$/) {
                 push @source,$1;
             }
             else {