From: cjwatson <>
Date: Sat, 23 Aug 2003 20:50:45 +0000 (-0800)
Subject: [project @ 2003-08-23 13:50:45 by cjwatson]
X-Git-Tag: release/2.6.0~810
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b864a0e5e8ecca71a8a3c39fca228464c351f913;p=debbugs.git

[project @ 2003-08-23 13:50:45 by cjwatson]
Rename $gFowardList to $gForwardList. Shim kept in errorlib for
compatibility with old config files.
---

diff --git a/scripts/config.debian b/scripts/config.debian
index 513a4d7..d4ba59b 100644
--- a/scripts/config.debian
+++ b/scripts/config.debian
@@ -1,5 +1,5 @@
 # This is the bugs.debian.org debbugs configuration file.
-# $Id: config.debian,v 1.22 2003/08/20 23:33:54 cjwatson Exp $
+# $Id: config.debian,v 1.23 2003/08/23 13:50:45 cjwatson Exp $
 
 # Domains
 $gEmailDomain = "bugs.debian.org";
@@ -22,7 +22,7 @@ $gMaintainerEmail = "owner\@bugs.debian.org";
 $gSubmitList = "debian-bugs-dist";
 $gMaintList = "debian-bugs-dist";
 $gQuietList = "debian-bugs-dist";
-$gFowardList = "debian-bugs-forwarded";
+$gForwardList = "debian-bugs-forwarded";
 $gDoneList = "debian-bugs-closed";
 $gRequestList = "debian-bugs-dist";
 $gSubmitterList = "debian-bugs-dist";
diff --git a/scripts/config.in b/scripts/config.in
index 01b8aca..a8d34f5 100644
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,6 +1,6 @@
 # This is the template debbugs configuration file.
 # You *must* edit it in order for debbugs to work.
-# $Id: config.in,v 1.20 2003/08/06 11:27:11 cjwatson Exp $
+# $Id: config.in,v 1.21 2003/08/23 13:50:45 cjwatson Exp $
 
 # Domains
 $gEmailDomain = "bugs.something";			# e.g. bugs.debian.org
@@ -30,7 +30,7 @@ $gUnknownMaintainerEmail = "$gMaintainerEmail";		# e.g. unknown-package@qa.debia
 $gSubmitList = "bug-submit-list";		# e.g. debian-bugs-dist
 $gMaintList = "bug-maint-list";			# e.g. debian-bugs-dist
 $gQuietList = "bug-quiet-list";			# e.g. debian-bugs-dist
-$gFowardList = "bug-forward-list";		# e.g. debian-bugs-forwarded
+$gForwardList = "bug-forward-list";		# e.g. debian-bugs-forwarded
 $gDoneList = "bug-done-list";			# e.g. debian-bugs-closed
 $gRequestList = "bug-request-list";		# e.g. debian-bugs-dist
 $gSubmitterList = "bug-submitter-list";		# e.g. debian-bugs-dist
diff --git a/scripts/config.in.default b/scripts/config.in.default
index 0efb287..353ce5d 100644
--- a/scripts/config.in.default
+++ b/scripts/config.in.default
@@ -1,4 +1,4 @@
-# $Id: config.in.default,v 1.4 2003/04/28 23:51:15 cjwatson Exp $
+# $Id: config.in.default,v 1.5 2003/08/23 13:50:45 cjwatson Exp $
 #domains
 $gEmailDomain = "bugs.top.domain";		#bugs.debian.org
 $gListDomain = "lists.top.domain";		#lists.debian.org
@@ -29,7 +29,7 @@ $gPseudoDescFile = "/etc/debbugs/pseudo-packages.description";
 $gSubmitList = "submit.list";			#debian-bugs-dist@lists
 $gMaintList = "maint.list";				#
 $gQuietList = "quiet.list";				#
-$gFowardList = "forward.list";			#debian-bugs-forwarded@lists
+$gForwardList = "forward.list";			#debian-bugs-forwarded@lists
 $gDoneList = "done.list";				#debian-bugs-closed@lists
 $gRequestList = "request.list";
 $gSubmitterList = "submitter.list";
diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index cdddada..fbe9fc3 100755
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.36 2003/08/23 13:17:32 cjwatson Exp $
+# $Id: errorlib.in,v 1.37 2003/08/23 13:50:45 cjwatson Exp $
 
 use Mail::Address;
 
@@ -391,4 +391,9 @@ sub isstrongseverity {
 grep ($_= $_ eq '' ? $gDefaultSeverity : $_, @showseverities);
 %displayshowseverities= %gSeverityDisplay;
 
+# compatibility
+if (defined $gFowardList and not defined $gForwardList) {
+    $gForwardList = $gFowardList;
+}
+
 1;
diff --git a/scripts/process.in b/scripts/process.in
index c340880..0eb6be1 100755
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: process.in,v 1.80 2003/08/23 13:17:32 cjwatson Exp $
+# $Id: process.in,v 1.81 2003/08/23 13:50:45 cjwatson Exp $
 #
 # Usage: process nn
 # Temps:  incoming/Pnn
@@ -250,8 +250,8 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
         $receivedat= "forwarded\@$gEmailDomain";
         $markaswhat= 'forwarded';
         $set_forwarded= $header{'to'};
-	if ( length( $gListDomain ) > 0 && length( $gFowardList ) > 0 ) {
-	    $generalcc= "$gFowardList\@$gListDomain";
+	if ( length( $gListDomain ) > 0 && length( $gForwardList ) > 0 ) {
+	    $generalcc= "$gForwardList\@$gListDomain";
 	} else { 
 	    $generalcc=''; 
         }
diff --git a/scripts/service.in b/scripts/service.in
index b2b063b..a24a697 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.87 2003/08/23 13:17:32 cjwatson Exp $
+# $Id: service.in,v 1.88 2003/08/23 13:50:45 cjwatson Exp $
 #
 # Usage: service <code>.nn
 # Temps:  incoming/P<code>.nn
@@ -387,8 +387,8 @@ END
             }
             do {
                 &addmaintainers($data->{package}, $data->{severity});
-		if (length($gFowardList)>0 && length($gListDomain)>0 ) {
-		     &addccaddress("$gFowardList\@$gListDomain"); 
+		if (length($gForwardList)>0 && length($gListDomain)>0 ) {
+		     &addccaddress("$gForwardList\@$gListDomain"); 
 		}
                 $data->{forwarded}= $whereto;
             } while (&getnextbug);