merge changes from dla source

[debbugs.git] / Debbugs / Control.pm

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index cf2ab8416566df3645c823d758393ce82cd27c0f..5fdba0650304707f64db1103e13ffb01bd03978d 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -498,7 +498,7 @@ sub set_blocks {
                }
                $data->{blocks} = join(' ',sort keys %blocks);
                my $action = ($add_remove eq 'add'?'Added':'Removed').
-                   " indication that bug $data->{bug_num} blocks".
+                   " indication that bug $data->{bug_num} blocks ".
                    join(',',@blocks);
                append_action_to_log(bug => $data->{bug_num},
                                     command => 'block',
@@ -509,6 +509,7 @@ sub set_blocks {
                                                                   action => $action
                                                                   )
                                    );
+               writebug($data->{bug_num},$data);
            }
            __handle_affected_packages(%param,data=>\@blocking_data);
            add_recipients(recipients => $param{recipients},
@@ -616,7 +617,7 @@ sub set_tag {
        my %tag_added = ();
        my %tag_removed = ();
        my %fixed_removed = ();
-       my @old_tags = split /\,\s*/, $data->{keywords};
+       my @old_tags = split /\,?\s+/, $data->{keywords};
        my %tags;
        @tags{@old_tags} = (1) x @old_tags;
        my $reopened = 0;
@@ -658,7 +659,7 @@ sub set_tag {
            print {$transcript} "Unknown tag(s): ".join(', ',@bad_tags).".\n";
            print {$transcript} "These tags are recognized: ".join(', ',@{$config{tags}}).".\n";
        }
-       $data->{keywords} = join(', ',keys %tags); # double check this
+       $data->{keywords} = join(' ',keys %tags);
 
        my @changed;
        push @changed, 'added tag(s) '.english_join([keys %tag_added]) if keys %tag_added;
@@ -1948,12 +1949,14 @@ sub summary {
              }
              # skip a paragraph if it looks like it's control or
              # pseudo-headers
-             if ($line =~ m{^\s*(?:(?:Package|Source|Version)\:| #pseudo headers
-                                (?:package|(?:no|)owner|severity|tag|summary| #control
-                                     reopen|close|(?:not|)(?:fixed|found)|clone|
-                                     (?:force|)merge|user(?:category|tag|)
-                                )
-                           )\s+\S}x) {
+             if ($line =~ m{^\s*(?:Package|Source|Version|User|Tag|Severity)\:\s+\S}xi or #pseudo headers
+                 $line =~ m{^(?:package:?|(?:no|)owner|severity|tags?|summary| #control
+                                \#|reopen|close|(?:not|)(?:fixed|found)|clone|
+                                debug|(?:not|)forwarded|priority|
+                                (?:un|)block|limit|(?:un|)archive|
+                                reassign|retitle|affects|wrongpackage
+                                (?:un|force|)merge|user(?:category|tags?|)
+                            )\s+\S}xis) {
                   if (not length $paragraph) {
                        print {$debug} "Found control/pseudo-headers and skiping them\n";
                        $in_pseudoheaders = 1;