[project @ 2000-05-03 17:04:20 by gecko]

Added the first template email to debbugs-service

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 9fa9e71971d69e82855b001040838b9432b3d6e8..6cf66d83d1c8755cd2bd4a416dbc0c91dd8f323a 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -65,6 +65,7 @@ my %ConfigMap = (
                "Web Dir" => "www-dir",
                "Doc Dir" => "doc-dir",
                "Template Dir" => "template-dir",
+               "Not-Don-Con" => "not-don-con",
                "Maintainer File" => "maintainer-file",
                "Pseudo Description File" => "pseudo-description",
                "Submit List" => "submit-list",

diff --git a/debbugs-service b/debbugs-service
index 3fac28eea589ff0b08c2625111c151fc15b16c08..e636e5038f1429d1f93a6aa4050b1a033e83c0b3 100755 (executable)
--- a/debbugs-service
+++ b/debbugs-service
@@ -28,6 +28,7 @@ my $control;                                 #call to control or request
 my @body;                                  #list of commands
 my $replyto;                               #address of to send reply to
 my $transcript;                                    #building of return message
+my @message;                               #holds copy of msg to apply tags
 
 #############################################################################
 #  Commandline parsing
@@ -67,7 +68,7 @@ print "D1: config file=$config\n" if $Globals{ 'debug' };
 #############################################################################
 #  Load in template emails
 #############################################################################
-@notify_done_email = Debbugs::Email::LoadEmail( 
+@notify_done_email = Debbugs::Email::LoadEmail( $Globals{ 'template-dir' }.'/'.$Globals{ 'not-don-con' } );
 
 #############################################################################
 #  Find file name and load input file
@@ -278,31 +279,12 @@ END
                 $action= "$gBug closed, ack sent to submitter - they'd better know why !";
                 do {
                     &addmaintainers($s_package);
-                                       if ( length( $gDoneList ) > 0 && length( $gListDomain ) >
-                                       0 ) { &addccaddress("$gDoneList\@$gListDomain"); }
+                   if ( length( $gDoneList ) > 0 && length( $gListDomain ) > 0 ) 
+                   { &addccaddress("$gDoneList\@$gListDomain"); }
                     $s_done= $replyto;
-                   $message= <<END;
-From: $gMaintainerEmail ($gProject $gBug Tracking System)
-To: $s_originator
-Subject: $gBug#$ref acknowledged by developer
-         ($s_subject)
-References: $header{'message-id'} $s_msgid
-In-Reply-To: $s_msgid
-Message-ID: <handler.$ref.$nn.notifdonectrl.$midix\@$gEmailDomain>
-
-This is an automatic notification regarding your $gBug report.
-
-It has been marked as closed by one of the developers, namely
-$replyto.
-
-You should be hearing from them with a substantive response shortly,
-if you have not already done so.  If not, please contact them
-directly or myself.
-
-$gMaintainer
-(administrator, $gProject $gBugs database)
-END
-                    &sendmailmessage($message,$s_originator);
+                   @message = @notify_done_email;
+                   &Debbugs::Email::ProcessTags( ... );
+                    &sendmailmessage( join( "\n", @message), $s_originator );
                 } while (&getnextbug);
             }
         }

diff --git a/devel/debbugs.cfg b/devel/debbugs.cfg
index 902adee8570fe31c57189fc835f2a60ec3420af6..3d44550f9d614b7515236a8a8458f09f780bd5bb 100644 (file)
--- a/devel/debbugs.cfg
+++ b/devel/debbugs.cfg
@@ -15,6 +15,7 @@ Work Dir = "work-dir"
 Web Dir = "www-dir"
 Doc Dir = "doc-dir"
 Template Dir = "template-dir"
+Not-Don-Con = "not-don-con"
 Maintainer File = "maintainer-file"
 Submit List = "submit-list"
 Maint List = "maint-list"

diff --git a/examples/debbugs.cfg b/examples/debbugs.cfg
index cb69a579570c823526abd368f0acefda090e91bd..37f691df84e16c691b1bed9c7e1b281285b6312c 100644 (file)
--- a/examples/debbugs.cfg
+++ b/examples/debbugs.cfg
@@ -21,8 +21,17 @@ Spool Dir = /var/lib/debbugs/spool/incoming
 Work Dir = /var/lib/debbugs/spool
 Web Dir = /var/lib/debbugs/www
 Doc Dir = /var/lib/debbugs/www/txt
+Template Dir = /etc/debbugs/emails
 Maintainer File = /etc/debbugs/Maintainers
 
+##########################################################################
+# Emails                                                                 #
+# *-con are control/request responses.  Without -con are used by process #
+# not-* are notifing submitter responeses                                #
+# *-don[-con] are respones relating to "done" or "close" actions         #
+##########################################################################
+Not-Don-Con = notify-done-control.txt
+
 ##########################################################################
 # Lists                                                                  #
 ##########################################################################