From: cjwatson <>
Date: Sun, 31 Aug 2003 21:21:02 +0000 (-0800)
Subject: [project @ 2003-08-31 14:21:02 by cjwatson]
X-Git-Tag: release/2.6.0~800
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d3d66facd77ef0ae47ed5a4542992f2bcf308bed;p=debbugs.git

[project @ 2003-08-31 14:21:02 by cjwatson]
D'oh! It's $data, not %data. Sorry ...
---

diff --git a/scripts/service.in b/scripts/service.in
index a0cc06ec..a4cbc931 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.90 2003/08/30 00:15:15 cjwatson Exp $
+# $Id: service.in,v 1.91 2003/08/31 14:21:02 cjwatson Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -252,7 +252,7 @@ END
             } else {
                 $action= "$gBug closed, send any further explanations to $data->{originator}";
                 do {
-                    &addmaintainers(%data);
+                    &addmaintainers($data);
 					if ( length( $gDoneList ) > 0 && length( $gListDomain ) >
 					0 ) { &addccaddress("$gDoneList\@$gListDomain"); }
                     $data->{done}= $replyto;
@@ -303,9 +303,9 @@ END
                 $action= "$gBug assigned to package \`$newpackage'.";
             }
             do {
-                &addmaintainers(%data);
+                &addmaintainers($data);
                 $data->{package}= $newpackage;
-                &addmaintainers(%data);
+                &addmaintainers($data);
             } while (&getnextbug);
         }
     } elsif (m/^reopen\s+\#?(-?\d+)$/i ? ($noriginator='', 1) :
@@ -323,7 +323,7 @@ END
                     $noriginator eq '' ? "$gBug reopened, originator not changed." :
                         "$gBug reopened, originator set to $noriginator.";
                 do {
-                    &addmaintainers(%data);
+                    &addmaintainers($data);
                     $data->{originator}= $noriginator eq '' ?  $data->{originator} : $noriginator;
                     $data->{done}= '';
                 } while (&getnextbug);
@@ -338,7 +338,7 @@ END
         }
         if (&getbug) {
             &foundbug;
-            &addmaintainers(%data);
+            &addmaintainers($data);
             $oldsubmitter= $data->{originator};
             $data->{originator}= $newsubmitter;
             $action= "Changed $gBug submitter from $oldsubmitter to $newsubmitter.";
@@ -390,7 +390,7 @@ END
                 $extramessage= "(By the way, this $gBug is currently marked as done.)\n";
             }
             do {
-                &addmaintainers(%data);
+                &addmaintainers($data);
 		if (length($gForwardList)>0 && length($gListDomain)>0 ) {
 		     &addccaddress("$gForwardList\@$gListDomain"); 
 		}
@@ -407,7 +407,7 @@ END
             } else {
     $action= "Removed annotation that $gBug had been forwarded to $data->{forwarded}.";
                 do {
-                    &addmaintainers(%data);
+                    &addmaintainers($data);
                     $data->{forwarded}= '';
                 } while (&getnextbug);
             }
@@ -428,7 +428,7 @@ END
             $printseverity= "$gDefaultSeverity" if $printseverity eq '';
 	    $action= "Severity set to \`$newseverity'.";
 	    do {
-                &addmaintainers(%data);
+                &addmaintainers($data);
                 if (defined $gStrongList and isstrongseverity($newseverity)) {
                     addbcc("$gStrongList\@$gListDomain");
                 }
@@ -471,7 +471,7 @@ END
 		$action= "Tags removed: " . join(", ", @okaytags);
 	    }
 	    do {
-                &addmaintainers(%data);
+                &addmaintainers($data);
 	        $data->{keywords} = '' if ($addsub eq "set");
 		if ($addsub eq "sub") {
 		    foreach my $t (@badtags) {
@@ -495,7 +495,7 @@ END
 	}
         if (&getbug) {
             &foundbug;
-            &addmaintainers(%data);
+            &addmaintainers($data);
             $data->{subject}= $newtitle;
             $action= "Changed $gBug title.";
             &savebug;
@@ -520,7 +520,7 @@ END
 		@newmergelist= split(/ /,$data->{mergedwith});
                 $discref= $ref;
                 do {
-                    &addmaintainers(%data);
+                    &addmaintainers($data);
 		    $data->{mergedwith}= ($ref == $discref) ? ''
                         : join(' ',grep($_ ne $ref,@newmergelist));
                 } while (&getnextbug);
@@ -563,7 +563,7 @@ END
             $action= "Merged @newmergelist.";
 	    for $ref (@newmergelist) {
 		&getbug || die "huh ?  $gBug $ref disappeared during merge";
-                &addmaintainers(%data);
+                &addmaintainers($data);
 		$data->{mergedwith}= join(' ',grep($_ ne $ref,@newmergelist));
 		$data->{keywords}= join(' ', keys %tags);
 		&savebug;
@@ -641,7 +641,7 @@ END
                                 "marked as done.)\n";
             }
             do {
-                &addmaintainers(%data);
+                &addmaintainers($data);
                 $data->{owner} = $newowner;
             } while (&getnextbug);
         }
@@ -653,7 +653,7 @@ END
                 $action = "Removed annotation that $gBug was owned by " .
                           "$data->{owner}.";
                 do {
-                    &addmaintainers(%data);
+                    &addmaintainers($data);
                     $data->{owner} = '';
                 } while (&getnextbug);
             } else {
@@ -1052,11 +1052,11 @@ sub addccaddress {
 sub addmaintainers {
     # Data structure is:
     #   maintainer email address &c -> assoc of packages -> assoc of bug#'s
-    my %data = @_;
+    my $data = shift;
     my ($p, $addmaint, $pshow);
     &ensuremaintainersloaded;
     $anymaintfound=0; $anymaintnotfound=0;
-    for $p (split(m/[ \t?,()]+/, $data{package})) {
+    for $p (split(m/[ \t?,()]+/, $data->{package})) {
  	$p =~ y/A-Z/a-z/;
         $pshow= ($p =~ m/[-+.a-z0-9]+/ ? $& : '');
 	if (defined $gSubscriptionDomain) {
@@ -1066,8 +1066,8 @@ sub addmaintainers {
 		addbcc("$p\@$gSubscriptionDomain");
 	    }
 	}
-        if (defined $data{severity} and defined $gStrongList and
-                isstrongseverity($data{severity})) {
+        if (defined $data->{severity} and defined $gStrongList and
+                isstrongseverity($data->{severity})) {
             addbcc("$gStrongList\@$gListDomain");
         }
         if (defined($maintainerof{$p})) {
@@ -1083,11 +1083,11 @@ sub addmaintainers {
 	}
     }
 
-    if (length $data{owner}) {
-        $addmaint = $data{owner};
-        &transcript("MO|$addmaint|$data{package}|$ref|\n") if $dl>2;
-        $maintccreasons{$addmaint}{$data{package}}{$ref} = 1;
-        print "owner add >$data{package}|$addmaint<\n" if $debug;
+    if (length $data->{owner}) {
+        $addmaint = $data->{owner};
+        &transcript("MO|$addmaint|$data->{package}|$ref|\n") if $dl>2;
+        $maintccreasons{$addmaint}{$data->{package}}{$ref} = 1;
+        print "owner add >$data->{package}|$addmaint<\n" if $debug;
     }
 }