fix bug in affects, use common_control_options in set_title, and a slew of minor...

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 358842cd023e5003d66bd8a53c0b45a630b07b70..129cfd284677c55127e231e47f737cc8d1ed0c18 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -82,7 +82,10 @@ BEGIN{
      $DEBUG = 0 unless defined $DEBUG;
 
      @EXPORT = ();
-     %EXPORT_TAGS = (affects => [qw(affects)],
+     %EXPORT_TAGS = (reopen    => [qw(reopen)],
+                    submitter => [qw(set_submitter)],
+                    severity => [qw(set_severity)],
+                    affects => [qw(affects)],
                     summary => [qw(summary)],
                     owner   => [qw(owner)],
                     title   => [qw(set_title)],
@@ -114,7 +117,8 @@ use IO::File;
 
 use Debbugs::Text qw(:templates);
 
-use Debbugs::Mail qw(rfc822_date);
+use Debbugs::Mail qw(rfc822_date send_mail_message default_headers);
+use Debbugs::MIME qw(create_mime_message);
 
 use Mail::RFC822::Address qw();
 
@@ -157,6 +161,9 @@ my %common_options = (debug       => {type => SCALARREF|HANDLE,
                      request_nn       => {type => SCALAR,
                                           optional => 1,
                                          },
+                     request_replyto   => {type => SCALAR,
+                                           optional => 1,
+                                          },
                     );
 
 
@@ -242,7 +249,7 @@ my %append_action_options =
 #      writebug($data->{bug_num},$data);
 #      print {$transcript} "$action\n";
 #     }
-#     __end_control(\%info);
+#     __end_control(%info);
 # }
 
 =head2 set_tag
@@ -498,7 +505,7 @@ sub set_severity {
        writebug($data->{bug_num},$data);
        print {$transcript} "$action\n";
     }
-    __end_control(\%info);
+    __end_control(%info);
 }
 
 
@@ -579,7 +586,7 @@ sub reopen {
            push @change_submitter,$data->{bug_num};
        }
     }
-    __end_control(\%info);
+    __end_control(%info);
     my @params_for_subcalls = 
        map {exists $param{$_}?($_,$param{$_}):()}
            (keys %common_options,
@@ -657,21 +664,22 @@ sub set_submitter {
        my $old_data = dclone($data);
        print {$debug} "Going to change bug submitter\n";
        if (((not defined $param{submitter} or not length $param{submitter}) and
-             (not defined $data->{submitter} or not length $data->{submitter})) or
-            $param{submitter} eq $data->{submitter}) {
+             (not defined $data->{originator} or not length $data->{originator})) or
+            (defined $param{submitter} and defined $data->{originator} and
+             $param{submitter} eq $data->{originator})) {
            print {$transcript} "Ignoring request to change the submitter of bug#$data->{bug_num} to the same value\n"
                unless __internal_request();
            next;
        }
        else {
-           if (defined $data->{submitter} and length($data->{submitter})) {
-               $action= "Changed $config{bug} submitter to '$param{submitter}' from '$data->{submitter}'";
+           if (defined $data->{originator} and length($data->{originator})) {
+               $action= "Changed $config{bug} submitter to '$param{submitter}' from '$data->{originator}'";
                $notify_old_submitter = 1;
            }
            else {
                $action= "Set $config{bug} submitter to '$param{submitter}'.";
            }
-           $data->{submitter} = $param{submitter};
+           $data->{originator} = $param{submitter};
        }
         append_action_to_log(bug => $data->{bug_num},
                             command => 'submitter',
@@ -689,26 +697,23 @@ sub set_submitter {
        # notify old submitter
        if ($notify_old_submitter and $param{notify_submitter}) {
            send_mail_message(message =>
-                             create_mime_message(["X-Loop"      => $config{maintainer_email},
-                                                  From          => "$config{maintainer_email} ($config{project} $config{ubug} Tracking System)",
-                                                  To            => $old_data->{submitter},
-                                                  Subject       => "$config{ubug}#$data->{bug_num} submitter addressed changed ($param{request_subject})",
-                                                  "Message-ID"  => "<$data->{bug_num}.$param{request_nn}.ackfwdd\@$config{email_domain}>",
-                                                  "In-Reply-To" => $param{request_msgid},
-                                                  References    => join(' ',grep {defined $_} $param{request_msgid},$data->{msgid}),
-                                                  Precedence    => 'bulk',
-                                                  "X-$gProject-PR-Message"  => "submitter-changed $data->{bug_num}",
-                                                  "X-$gProject-PR-Package"  => $data->{package},
-                                                  "X-$gProject-PR-Keywords" => $data->{keywords},
-                                                  # Only have a X-$gProject-PR-Source when we know the source package
-                                                  (defined($source_package) and length($source_package))?("X-$gProject-PR-Source" => $source_package):(),
+                             create_mime_message([default_headers(queue_file => $param{request_nn},
+                                                                  data => $data,
+                                                                  msgid => $param{request_msgid},
+                                                                  msgtype => 'ack',
+                                                                  pr_msg  => 'submitter-changed',
+                                                                  headers =>
+                                                                  [To => $old_data->{submitter},
+                                                                   Subject => "$config{ubug}#$data->{bug_num} submitter addressed changed ($param{request_subject})",
+                                                                  ],
+                                                                 )
                                                  ],
-                                                 message_body_template('mail/submitter_changed',
-                                                                       {old_data => $old_data,
-                                                                        data     => $data,
-                                                                        replyto  => exists $param{header}{'reply-to'} ? $param{request_replyto} : $param{requester} || 'Unknown',
-                                                                        config   => \%config,
-                                                                       })
+                                                 __message_body_template('mail/submitter_changed',
+                                                                         {old_data => $old_data,
+                                                                          data     => $data,
+                                                                          replyto  => exists $param{header}{'reply-to'} ? $param{request_replyto} : $param{requester} || 'Unknown',
+                                                                          config   => \%config,
+                                                                         })
                                                 ),
                              recipients => $old_data->{submitter},
                             );
@@ -2494,6 +2499,40 @@ sub sig_die{
 }
 
 
+# =head2 __message_body_template
+#
+#      message_body_template('mail/ack',{ref=>'foo'});
+#
+# Creates a message body using a template
+#
+# =cut
+
+sub __message_body_template{
+     my ($template,$extra_var) = @_;
+     $extra_var ||={};
+     my $hole_var = {'&bugurl' =>
+                    sub{"$_[0]: ".
+                            'http://'.$config{cgi_domain}.'/'.
+                                Debbugs::CGI::bug_url($_[0]);
+                    }
+                   };
+
+     my $body = fill_in_template(template => $template,
+                                variables => {config => \%config,
+                                              %{$extra_var},
+                                             },
+                                hole_var => $hole_var,
+                               );
+     return fill_in_template(template => 'mail/message_body',
+                            variables => {config => \%config,
+                                          %{$extra_var},
+                                          body => $body,
+                                         },
+                            hole_var => $hole_var,
+                           );
+}
+
+
 1;
 
 __END__

diff --git a/scripts/service b/scripts/service
index 231ae83d36d411fde7eb53ea882d09d68ce991dc..66173aa1a429af462f6df96ff70d2161a0d4285d 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -124,14 +124,14 @@ my %affected_packages;
 my %recipients;
 
 my @common_control_options =
-    (($dl > 0 (debug => $transcript):()),
+    (($dl > 0 ? (debug => $transcript):()),
      transcript        => $transcript,
      requester         => $header{from},
      request_addr      => $controlrequestaddr,
      request_msgid     => $header{'message-id'},
      request_subject   => $header{subject},
      request_nn        => $nn,
-     request_replyto   => $replyto
+     request_replyto   => $replyto,
      message           => \@log,
      affected_packages => \%affected_packages,
      recipients        => \%recipients,
@@ -177,10 +177,6 @@ our $mismatch;
 our $action;
 
 
-# recipients of mail
-my %recipients;
-# affected_packages
-my %affected_packages;
 my $ok = 0;
 my $unknowns = 0;
 my $procline=0;
@@ -795,10 +791,11 @@ END
            }
        }
        my $tags = $4;
-       my @tags = /[\s,]+/, $tags;
+       my @tags = split /[\s,]+/, $tags;
+       my @badtags = ();
        foreach my $tag (@tags) {
            if (not defined first {$_ eq $tag} @{$config{tags}}) {
-               push @badtags, $t;
+               push @badtags, $tag;
            }
        }
        if (@badtags) {
@@ -936,13 +933,8 @@ END
        $ref = $clonebugs{$ref} if exists $clonebugs{$ref};
        $bug_affected{$ref} = 1;
        eval {
-            set_title(bug          => $ref,
-                      transcript   => $transcript,
-                      ($dl > 0 ? (debug => $transcript):()),
-                      requester    => $header{from},
-                      request_addr => $controlrequestaddr,
-                      message      => \@log,
-                      recipients   => \%recipients,
+            set_title(@common_control_options,
+                      bug          => $ref,
                       title        => $newtitle,
                      );
        };
@@ -1194,6 +1186,7 @@ END
        $bug_affected{$ref} = 1;
        eval {
             affects(@common_control_options,
+                    bug => $ref,
                     packages     => [splitpackages($3)],
                     ($add_remove eq '+'?(add => 1):()),
                     ($add_remove eq '-'?(remove => 1):()),