[project @ 1999-09-18 21:01:27 by gecko]

service and processall -w clean
nn-done email added to the ack sent to closer and -bugs-closed list

diff --git a/scripts/process.in b/scripts/process.in
index 70e17aecdc8fe50e64940ec30b53e91090e164e4..72cf0c15e8241997248cc09cbb6dcce7450e9bd3 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.6 1999/09/18 14:53:02 gecko Exp $
+# $Id: process.in,v 1.7 1999/09/18 21:01:27 gecko Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -94,10 +94,11 @@ while (defined ($msg[$i] ) )
 {
        last if ( $msg[$i] !~ m/^([\w]+):\s*(\S+)/ );
        $i++;
-       $fn = $1; $fv = $2;
+       $fn = $1; $fv $2;
        print DEBUG ">$fn|$'|\n";
     $fwd .= $fn.': '.$fv."\n";
     $fn =~ y/A-Z/a-z/;
+    $fv =~ y/A-Z/a-z/;
     $pheader{$fn}= $fv;
        print DEBUG ">$fn~$fv<\n";
 }

diff --git a/scripts/processall.in b/scripts/processall.in
index 432ea9ed97f9d55b9567f323802377143ca9f97f..26b402b3e4c00a05b14d22ad4d8093e3b292be8a 100755 (executable)
--- a/scripts/processall.in
+++ b/scripts/processall.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: processall.in,v 1.2 1999/09/02 22:27:29 gecko Exp $
+# $Id: processall.in,v 1.3 1999/09/18 21:01:27 gecko Exp $
 #
 # Usage: processall
 #
@@ -25,7 +25,7 @@ for (;;) {
     }
     if (!@ids) {
         opendir(DIR,"incoming") || die $!;
-        while ($_= readdir(DIR)) { push(@ids,$_) if s/^I//; }
+        while ( defined( $_= readdir(DIR) )) { push(@ids,$_) if s/^I//; }
         last unless @ids;
         @ids= sort(@ids);
     }

diff --git a/scripts/service.in b/scripts/service.in
index a789b2bac6e36dfaf94a56b2bac450a7bb216dc2..bce816f0d5bca692432c77dc8bd0e212d0149442 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: service.in,v 1.6 1999/09/18 14:53:02 gecko Exp $
+# $Id: service.in,v 1.7 1999/09/18 21:01:27 gecko Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -11,17 +11,15 @@ $ENV{'PATH'}= '/usr/lib/debbugs'.$ENV{'PATH'};;
 chdir("$gSpoolDir") || die "chdir spool: $!\n";
 
 # open(DEBUG,">&4");
-
+$debug = 0;
 $wwwbase= "$gWebDir";
 
-# defined($intdate= time) || &quit("failed to get time: $!");
-
 $_=shift;
 m/^[RC]\.\d+$/ || &quit("bad argument");
 $control= m/C/;
 $nn= $_;
-if (!rename("incoming/G$nn","incoming/P$nn")) {
-    $_=$!.'';  m/no such file or directory/i && exit 0;
+if (!rename("incoming/G$nn","incoming/P$nn")) 
+{      $_=$!.'';  m/no such file or directory/i && exit 0;
     &quit("renaming to lock: $!");
 }    
 
@@ -32,30 +30,28 @@ close(M);
 
 grep((s/\n$//,s/\s+$//),@msg);
 
-print DEBUG "###\n",join("##\n",@msg),"\n###\n";
+print "###\n",join("##\n",@msg),"\n###\n" if $debug;
 
 chop($tdate= `date -u '+%a, %d %h %Y %T GMT'`);
 $fwd= <<END;
 Received: via spool for service; $tdate
 END
 
-for ($i=0; $i<=$#msg; $i++) {
-    $_ = $msg[$i];
+for ($i=0; $i<=$#msg; $i++) 
+{      $_ = $msg[$i];
     last unless length($_);
     $fwd .= $_."\n";
-    while ($msg[$i+1] =~ m/^\s/) {
-        $i++;
+    while ($msg[$i+1] =~ m/^\s/) 
+       {       $i++;
         $fwd .= $msg[$i]."\n" if $ins; # Huh ? Where is ins set ?
         $_ .= ' '.$msg[$i];
     }
-# print DEBUG ">$_<\n";
-    if (s/^(\S+):\s*//) {
-        $v= $1; $v =~ y/A-Z/a-z/;
-print DEBUG ">$v=$_<\n";
+       print ">$_<\n" if $debug;
+    if (s/^(\S+):\s*//) 
+       {       $v= $1; $v =~ y/A-Z/a-z/;
+               print ">$v=$_<\n" if $debug;
         $header{$v}= $_;
-    } else {
-print DEBUG "!>$_<\n";
-    }
+    } else { print "!>$_<\n" if $debug; }
 }
 
 defined($header{'from'}) || &quit("no From header");
@@ -72,25 +68,30 @@ $mergelowstate= 'idle';
 $midix=0;    
 $extras="";
 
+#strip blank line(s) after header
 while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
 
+#strip, if exists, mime header
+if ( $msg[$i] =~ /^This is a multi-part message in MIME format./ )
+{      while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i] . "\n"; $i++; }
+       while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
+}
 if ( $msg[$i] =~ /^--/ || $msg[$i] =~ /^\s*$/ )
-{
-       while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i]; $i++; }
+{      while ( $i <= $#msg && length( $msg[$i] ) ) { $fwd .= $msg[$i]; $i++; }
        while ( $i <= $#msg && !length( $msg[$i] ) ) { $fwd .= "\n"; $i++; }
 }      
 
 
-for ($procline=$i; $procline<=$#msg; $procline++) {
-    $state eq 'idle' || print "$state ?\n";
+for ($procline=$i; $procline<=$#msg; $procline++) 
+{      $state eq 'idle' || print "$state ?\n";
     $lowstate eq 'idle' || print "$lowstate ?\n";
     $mergelowstate eq 'idle' || print "$mergelowstate ?\n";
     $_= $msg[$procline]; s/\s+$//;
     next unless m/\S/; next if m/^\s*\#/;
     &transcript("> $_\n");
     $action= '';
-    if (m/^stop$/ || m/^quit$/ || m/^--/ || m/^thank/) {
-        &transcript("Stopping processing here.\n\n");
+    if (m/^stop$/ || m/^quit$/ || m/^--/ || m/^thank/) 
+       {       &transcript("Stopping processing here.\n\n");
         last;
     } elsif (m/^debug\s+(\d+)$/ && $1 >= 0 && $1 <= 1000) {
         $dl= $1+0;
@@ -255,6 +256,7 @@ END
     } elsif (m/^reassign\s+\#?(\d+)\s+(\S.*\S)$/) {
         $ok++;
         $ref= $1; $newpackage= $2;
+       $newpackage =~ y/A-Z/a-z/;
         if (&setbug) {
             if (length($s_package)) {
                 $action= "$gBug reassigned from package \`$s_package'".
@@ -450,7 +452,7 @@ for $maint (keys %maintccreasons) {
 if (@maintccs) {
     &transcript("MC|@maintccs|\n") if $dl>2;
     $maintccs= "Cc: ".join(",\n    ",@maintccs)."\n";
-}
+} else { $maintccs = ""; }
 
 $reply= <<END;
 From: $gMaintainerEmail ($gMaintainer)
@@ -494,7 +496,7 @@ sub get_addresses {
 
 sub sendmailmessage {
     local ($message,@recips) = @_;
-    print DEBUG "mailing to >@recips<\n";
+    print "mailing to >@recips<\n" if $debug;
     $c= open(D,"|-");
     defined($c) || &quit("mailing forking for sendmail: $!");
     if (!$c) { # ie, we are the child process
@@ -716,7 +718,7 @@ sub dlex {
 }
 
 sub transcript {
-    print(DEBUG $_[0]);
+    print $_[0] if $debug;
     $transcript.= $_[0];
 }
 
@@ -783,23 +785,21 @@ sub addccaddress {
     $maintccreasons{$cca}{''}{$ref}= 1;
 }
 
-sub addmaintainers {
-    # Data structure is:
+sub addmaintainers 
+{      # Data structure is:
     #   maintainer email address &c -> assoc of packages -> assoc of bug#'s
     my ($p, $addmaint, $pshow);
     &ensuremaintainersloaded;
     $anymaintfound=0; $anymaintnotfound=0;
-    for $p (split(m/[ \t?,()]+/,$_[0])) {
-        $p =~ y/A-Z/a-z/;
+    for $p (split(m/[ \t?,()]+/,$_[0])) 
+       {       $p =~ y/A-Z/a-z/;
         $pshow= ($p =~ m/[-+.a-z0-9]+/ ? $& : '');
-        if (defined($maintainerof{$p})) {
-            $addmaint= $maintainerof{$p};
-&transcript("MR|$addmaint|$p|$ref|\n") if $dl>2;
+        if (defined($maintainerof{$p})) 
+               {       $addmaint= $maintainerof{$p};
+                       &transcript("MR|$addmaint|$p|$ref|\n") if $dl>2;
             $maintccreasons{$addmaint}{$p}{$ref}= 1;
-print DEBUG "maintainer add >$p|$addmaint<\n";
-        } else {
-print DEBUG "maintainer none >$p<\n";
-        }
+                       print "maintainer add >$p|$addmaint<\n" if $debug;
+        } else { print "maintainer none >$p<\n" if $debug; }
     }
 }